From a59e358199cdb73a5cb647b53d6c430fc4b49e00 Mon Sep 17 00:00:00 2001 From: thunderbiscuit Date: Tue, 18 Apr 2023 16:50:43 -0400 Subject: [PATCH] Pin Rust version in CI workflows to 1.67 --- .github/workflows/publish-android.yaml | 5 ++- .github/workflows/publish-jvm.yaml | 8 ++++- .github/workflows/publish-python.yaml | 25 ++++++++------- .github/workflows/test-android.yaml | 11 ++++++- .github/workflows/test-jvm.yaml | 4 +++ .github/workflows/test-python.yaml | 43 ++++++++++++++------------ .github/workflows/test-swift.yaml | 4 +++ bdk-python/README.md | 2 ++ 8 files changed, 69 insertions(+), 33 deletions(-) diff --git a/.github/workflows/publish-android.yaml b/.github/workflows/publish-android.yaml index f36f6bd2..427f7624 100644 --- a/.github/workflows/publish-android.yaml +++ b/.github/workflows/publish-android.yaml @@ -10,7 +10,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: "Install Android NDK 21.4.7075529" run: | @@ -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..90ffde38 100644 --- a/.github/workflows/publish-python.yaml +++ b/.github/workflows/publish-python.yaml @@ -9,7 +9,7 @@ on: [workflow_dispatch] jobs: build-manylinux2014-x86_64-wheel: name: "Build Manylinux 2014 x86_64 wheel" - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 defaults: run: working-directory: bdk-python @@ -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 @@ -60,10 +63,10 @@ jobs: strategy: matrix: python: - - '3.7' - - '3.8' - - '3.9' - - '3.10' + - "3.7" + - "3.8" + - "3.9" + - "3.10" steps: - name: "Checkout" uses: actions/checkout@v2 @@ -91,7 +94,7 @@ jobs: path: /Users/runner/work/bdk-ffi/bdk-ffi/bdk-python/dist/*.whl build-windows-wheel: - name: "Build windows wheel" + name: "Build Windows wheel" runs-on: windows-2022 defaults: run: @@ -99,10 +102,10 @@ jobs: strategy: matrix: python: - - '3.7' - - '3.8' - - '3.9' - - '3.10' + - "3.7" + - "3.8" + - "3.9" + - "3.10" steps: - name: "Checkout" uses: actions/checkout@v2 @@ -128,7 +131,7 @@ jobs: publish-pypi: name: "Publish on PyPI" - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 defaults: run: working-directory: bdk-python diff --git a/.github/workflows/test-android.yaml b/.github/workflows/test-android.yaml index 6690fd64..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,7 @@ env: jobs: build: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: "Install Android NDK 21.4.7075529" run: | @@ -45,9 +46,17 @@ 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 + - name: "Build Android library" + run: | + cd bdk-android + ./gradlew buildAndroidLib + # There are currently no unit tests for bdk-android and the integration tests require the macOS image # which is not working with the older NDK version we are using, so for now we just make sure that the library builds. # - name: "Run Android unit tests" 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..645e5440 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/**" @@ -17,7 +18,7 @@ on: jobs: build-manylinux2014-x86_64-wheel: name: "Build and test Manylinux 2014 x86_64 wheels" - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 defaults: run: working-directory: bdk-python @@ -29,11 +30,13 @@ jobs: strategy: matrix: python: - # - cp36-cp36m - # - cp37-cp37m - # - cp38-cp38 - # - cp39-cp39 + - cp36-cp36m + - cp37-cp37m + - cp38-cp38 + - cp39-cp39 - cp310-cp310 + - pp37-pypy37_pp73 + - pp38-pypy38_pp73 steps: - name: "Checkout" uses: actions/checkout@v2 @@ -43,6 +46,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 @@ -73,10 +79,10 @@ jobs: strategy: matrix: python: - # - '3.7' - # - '3.8' - # - '3.9' - - '3.10' + - "3.7" + - "3.8" + - "3.9" + - "3.10" steps: - name: Checkout uses: actions/checkout@v2 @@ -113,10 +119,10 @@ jobs: strategy: matrix: python: - # - '3.7' - # - '3.8' - # - '3.9' - - '3.10' + - "3.7" + - "3.8" + - "3.9" + - "3.10" steps: - name: "Checkout" uses: actions/checkout@v2 @@ -135,12 +141,11 @@ jobs: - name: "Build wheel" run: python setup.py bdist_wheel --verbose - # TODO: On Windows the pip install ./dist/*.whl step fails with the following error: - # Run pip install ./dist/*.whl - # WARNING: Requirement './dist/*.whl' looks like a filename, but the file does not exist - # ERROR: *.whl is not a valid wheel filename.*.whl is not a valid wheel name - # So we skip the installing and the tests and simply test that the wheel builds - +# TODO: On Windows the pip install ./dist/*.whl step fails with the following error: +# Run pip install ./dist/*.whl +# WARNING: Requirement './dist/*.whl' looks like a filename, but the file does not exist +# ERROR: *.whl is not a valid wheel filename.*.whl is not a valid wheel name +# So we skip the installing and the tests and simply test that the wheel builds # - name: Install wheel # run: pip install ./dist/*.whl # - name: Run tests 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-python/README.md b/bdk-python/README.md index 45cf3c6a..8d0e9b22 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 ``` + +Extra line for CI test