[DO-000] use specific artifact name to download it (#370)

* use specific artifact name to download it * try again * use pwd * more debug * update * Fix * Remove ls tests * Release 1.1.134 [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] Generated by cargo-workspaces --------- Co-authored-by: micbakos-rdx <[email protected]>
radixdlt · Feb 10, 2025 · 059e84b · 059e84b
1 parent 72766db
commit 059e84b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/release-kotlin-desktop.yml b/.github/workflows/release-kotlin-desktop.yml
@@ -74,9 +74,15 @@ jobs:
     steps:
       - uses: RDXWorks-actions/checkout@main
 
-      - uses: RDXWorks-actions/download-artifact@main
+      - uses: RDXWorks-actions/download-artifact-v4@main
         with:
-          path: artifacts
+          name: aarch64-apple-darwin
+          path: artifacts/aarch64-apple-darwin
+
+      - uses: RDXWorks-actions/download-artifact-v4@main
+        with:
+          name: x86_64-unknown-linux-gnu
+          path: artifacts/x86_64-unknown-linux-gnu
 
       - name: Set up JDK 17
         uses: RDXWorks-actions/setup-java@v3

diff --git a/jvm/sargon-android/build.gradle.kts b/jvm/sargon-android/build.gradle.kts
@@ -2,7 +2,6 @@ import com.radixdlt.cargo.desktop.DesktopTargetTriple
 import com.radixdlt.cargo.desktop.currentTargetTriple
 import com.radixdlt.cargo.toml.sargonVersion
 import org.gradle.configurationcache.extensions.capitalized
-import org.gradle.internal.logging.text.StyledTextOutput
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import java.nio.file.Files
 
@@ -342,16 +341,16 @@ tasks.register("copyExternalArtifacts") {
         val rustProjectDir = projectDir.parentFile.parentFile
         val artifactsDir = File(rustProjectDir, "artifacts")
 
-        val fileTargets = artifactsDir.listFiles()?.mapNotNull { file ->
+        val directoryTargets = artifactsDir.listFiles()?.mapNotNull { file ->
             val triple = DesktopTargetTriple.from(file.name) ?: return@mapNotNull null
             file to triple
         }.orEmpty()
 
-        if (fileTargets.isEmpty()) {
+        if (directoryTargets.isEmpty()) {
             error("No files found in ${artifactsDir.absolutePath}")
         }
 
-        fileTargets.forEach { target ->
+        directoryTargets.forEach { target ->
             exec {
                 workingDir = rustProjectDir
                 commandLine(