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

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

Hide file tree

Showing 10 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml
@@ -14,9 +14,10 @@ jobs:
     strategy:
       matrix:
         rust:
-          - version: 1.71.0 # STABLE
+          - version: 1.72.1 # STABLE
             clippy: true
-          - version: 1.61.0 # MSRV
+          # TODO: Should we keep this? We'll need to pin dependencies
+          # - version: 1.61.0 # MSRV
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/.github/workflows/publish-android.yaml b/.github/workflows/publish-android.yaml
@@ -37,8 +37,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 Rust Android targets"
         run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi

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/publish-python.yaml b/.github/workflows/publish-python.yaml
@@ -29,6 +29,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+      # TODO: Other CI workflows use explicit Rust compiler versions, I think we should do the same here
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable

diff --git a/.github/workflows/test-android.yaml b/.github/workflows/test-android.yaml
@@ -46,8 +46,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 Rust Android targets"
         run: rustup target add x86_64-linux-android aarch64-linux-android armv7-linux-androideabi

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 buildJvmLib
           ./gradlew test
+
+      - name: "Print directory structure"
+        run: |
+          pwd
+          ls -R
diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml
@@ -38,6 +38,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+      # TODO: Other CI workflows use explicit version of the Rust compiler, I think we should do the same here
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable

diff --git a/.github/workflows/test-swift.yaml b/.github/workflows/test-swift.yaml
@@ -17,8 +17,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - 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 Rust targets
         run: |

diff --git a/Cargo.toml b/Cargo.toml
@@ -9,4 +9,4 @@ opt-level = 'z'     # Optimize for size.
 lto = true          # Enable Link Time Optimization
 codegen-units = 1   # Reduce number of codegen units to increase optimizations.
 panic = 'abort'     # Abort on panic
-strip = true        # Strip symbols from binary
+strip = 'debuginfo'        # Strip symbols from binary
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
@@ -119,7 +119,6 @@ internal class UniFfiJvmPlugin : Plugin<Project> {
                 else       -> throw Exception("Unsupported OS")
             }
 
-            // 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")