Temp 13: Set Rust compiler CI build to stable (1.72.1)

bitcoindevkit · Oct 2, 2023 · f3cb156 · f3cb156
1 parent 45b107d
commit f3cb156
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/.github/workflows/publish-jvm.yaml b/.github/workflows/publish-jvm.yaml
@@ -24,8 +24,8 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
+      - name: "Set default Rust version to 1.72.1"
+        run: rustup default 1.72.1
 
       - name: "Install aarch64 Rust target"
         run: rustup target add aarch64-apple-darwin
@@ -54,8 +54,8 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
+      - name: "Set default Rust version to 1.72.1"
+        run: rustup default 1.72.1
 
       - name: "Install x86_64-pc-windows-msvc Rust target"
         run: rustup target add x86_64-pc-windows-msvc
@@ -94,8 +94,8 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
+      - name: "Set default Rust version to 1.72.1"
+        run: rustup default 1.72.1
 
       - name: "Build bdk-jvm library"
         run: |

diff --git a/.github/workflows/test-jvm.yaml b/.github/workflows/test-jvm.yaml
@@ -32,10 +32,16 @@ jobs:
           distribution: temurin
           java-version: 11
 
-      - name: "Set default Rust version to 1.67.0"
-        run: rustup default 1.67.0
+      - name: "Set default Rust version to 1.72.1"
+        run: rustup default 1.72.1
 
       - name: "Run JVM tests"
         run: |
           cd bdk-jvm
-          ./gradlew test
+          ./gradlew buildJvmLib
+#          ./gradlew test
+
+      - name: "Print directory structure"
+        run: |
+          pwd
+          ls -R
diff --git a/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt b/bdk-jvm/plugins/src/main/kotlin/org/bitcoindevkit/plugins/UniFfiJvmPlugin.kt
@@ -120,8 +120,9 @@ internal class UniFfiJvmPlugin : Plugin<Project> {
             }
 
             // workingDir("${project.projectDir}/../../bdk-ffi")
-            workingDir("${project.projectDir}/../../")
-            val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "--library", libraryPath, "--language", "kotlin", "--out-dir", "./bdk-jvm/lib/src/main/kotlin/", "--no-format")
+            workingDir("${project.projectDir}/../")
+            val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "--library", libraryPath, "--language", "kotlin", "--out-dir", "./", "--no-format")
+            // val cargoArgs: List<String> = listOf("run", "--bin", "uniffi-bindgen", "generate", "--library", libraryPath, "--language", "kotlin", "--out-dir", "./bdk-jvm/lib/src/main/kotlin/", "--no-format")
 
             executable("cargo")
             args(cargoArgs)