From 52b6dfb9ff901dd6471f0d244a43a7653b4fa8b1 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Sun, 23 Apr 2023 09:01:21 -0400 Subject: [PATCH] Pin Rust version in CI workflows to 1.67 --- .github/workflows/publish-android.yaml | 3 +++ .github/workflows/publish-jvm.yaml | 8 +++++++- .github/workflows/publish-python.yaml | 3 +++ .github/workflows/test-android.yaml | 2 +- .github/workflows/test-jvm.yaml | 4 ++++ .github/workflows/test-python.yaml | 4 ++++ .github/workflows/test-swift.yaml | 4 ++++ bdk-jvm/README.md | 2 ++ bdk-python/README.md | 2 ++ bdk-swift/README.md | 2 ++ 10 files changed, 32 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-android.yaml b/.github/workflows/publish-android.yaml index f36f6bd2..916d8550 100644 --- a/.github/workflows/publish-android.yaml +++ b/.github/workflows/publish-android.yaml @@ -37,6 +37,9 @@ jobs: distribution: temurin java-version: 11 + - name: "Set default Rust version to 1.67.0" + run: rustup default 1.67.0 + - 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 index a72189ef..8115112e 100644 --- a/.github/workflows/publish-jvm.yaml +++ b/.github/workflows/publish-jvm.yaml @@ -24,6 +24,9 @@ jobs: distribution: temurin java-version: 11 + - name: "Set default Rust version to 1.67.0" + run: rustup default 1.67.0 + - name: Install aarch64 Rust target run: rustup target add aarch64-apple-darwin @@ -43,7 +46,7 @@ jobs: build-jvm-full-library: name: Create full bdk-jvm library needs: [build-jvm-macOS-M1-native-lib] - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: Checkout publishing branch uses: actions/checkout@v2 @@ -68,6 +71,9 @@ jobs: distribution: temurin java-version: 11 + - name: "Set default Rust version to 1.67.0" + run: rustup default 1.67.0 + - name: Build bdk-jvm library run: | cd bdk-jvm diff --git a/.github/workflows/publish-python.yaml b/.github/workflows/publish-python.yaml index bb9da0aa..d9945883 100644 --- a/.github/workflows/publish-python.yaml +++ b/.github/workflows/publish-python.yaml @@ -37,6 +37,9 @@ jobs: with: toolchain: stable + - name: "Set default Rust version to 1.67.0" + run: rustup default 1.67.0 + - name: "Install requirements" run: ${PYBIN}/pip install -r requirements.txt diff --git a/.github/workflows/test-android.yaml b/.github/workflows/test-android.yaml index 59288901..221f9bae 100644 --- a/.github/workflows/test-android.yaml +++ b/.github/workflows/test-android.yaml @@ -1,5 +1,6 @@ name: Test Android on: + workflow_dispatch: push: paths: - "bdk-ffi/**" @@ -18,7 +19,6 @@ env: jobs: build: -# The build cannot be done on the ubuntu-22.04 image, see issue #346 runs-on: ubuntu-20.04 steps: - name: "Install Android NDK 21.4.7075529" diff --git a/.github/workflows/test-jvm.yaml b/.github/workflows/test-jvm.yaml index 643bf516..82e2b674 100644 --- a/.github/workflows/test-jvm.yaml +++ b/.github/workflows/test-jvm.yaml @@ -1,5 +1,6 @@ name: Test Kotlin/JVM on: + workflow_dispatch: push: paths: - "bdk-ffi/**" @@ -31,6 +32,9 @@ jobs: distribution: temurin java-version: 11 + - name: "Set default Rust version to 1.67.0" + run: rustup default 1.67.0 + - name: Run JVM tests run: | cd bdk-jvm diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml index 2eed3433..a6ca27e6 100644 --- a/.github/workflows/test-python.yaml +++ b/.github/workflows/test-python.yaml @@ -1,5 +1,6 @@ name: Test Python on: + workflow_dispatch: push: paths: - "bdk-ffi/**" @@ -43,6 +44,9 @@ jobs: with: toolchain: stable + - name: "Set default Rust version to 1.67.0" + run: rustup default 1.67.0 + - name: "Install requirements" run: ${PYBIN}/pip install -r requirements.txt diff --git a/.github/workflows/test-swift.yaml b/.github/workflows/test-swift.yaml index 38c1d971..7056b5d7 100644 --- a/.github/workflows/test-swift.yaml +++ b/.github/workflows/test-swift.yaml @@ -1,5 +1,6 @@ name: Test Swift on: + workflow_dispatch: push: paths: - "bdk-ffi/**" @@ -16,6 +17,9 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - name: "Set default Rust version to 1.67.0" + run: rustup default 1.67.0 + - name: Install Rust targets run: | rustup install nightly-x86_64-apple-darwin diff --git a/bdk-jvm/README.md b/bdk-jvm/README.md index a9a7e36c..b29d2ef3 100644 --- a/bdk-jvm/README.md +++ b/bdk-jvm/README.md @@ -98,3 +98,5 @@ dependencies { [`bdk`]: https://github.com/bitcoindevkit/bdk [`bdk-ffi`]: https://github.com/bitcoindevkit/bdk-ffi + +Temporary line: needed to run CI diff --git a/bdk-python/README.md b/bdk-python/README.md index 45cf3c6a..a97b0b45 100644 --- a/bdk-python/README.md +++ b/bdk-python/README.md @@ -46,3 +46,5 @@ tox -vv ```shell pip install ./dist/bdkpython--py3-none-any.whl ``` + +Temporary line: needed to run CI diff --git a/bdk-swift/README.md b/bdk-swift/README.md index 5de436af..1a3c5df6 100644 --- a/bdk-swift/README.md +++ b/bdk-swift/README.md @@ -50,3 +50,5 @@ own GitHub repository use the following steps: [Xcode]: https://developer.apple.com/documentation/Xcode [`bdk`]: https://github.com/bitcoindevkit/bdk [`bdk-ffi`]: https://github.com/bitcoindevkit/bdk-ffi + +Temporary line: needed to run CI