Skip to content

Commit

Permalink
use a single source of truth for rust version in workflows
Browse files Browse the repository at this point in the history
Signed-off-by: Ondrej Prazak <[email protected]>
  • Loading branch information
Ondrej Prazak committed Feb 23, 2024
1 parent 9803d30 commit 76876a7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
8 changes: 6 additions & 2 deletions .github/actions/build-napi/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ inputs:
node-version:
default: 18
rust-version:
default: 1.70.0
required: true

runs:
using: "composite"
Expand Down Expand Up @@ -45,11 +45,15 @@ runs:
run: npm install
working-directory: ${{ github.workspace }}/aries/wrappers/vcx-napi-rs
shell: bash
- name: Build docker image
if: ${{ inputs.docker }}
run: |
docker build -f aries/wrappers/vcx-napi-rs/${{ inputs.docker }}.Dockerfile -t ghcr.io/hyperledger/aries-vcx/napi-rs-${{ inputs.docker }}:latest .
- name: Build in docker
uses: addnab/docker-run-action@v3
if: ${{ inputs.docker }}
with:
image: ${{ inputs.docker }}
image: ghcr.io/hyperledger/aries-vcx/napi-rs-${{ inputs.docker }}
options: -v /home/runner/.cargo/git/db:/root/.cargo/git/db -v /home/runner/.cargo/registry/cache:/root/.cargo/registry/cache -v /home/runner/.cargo/registry/index:/root/.cargo/registry/index -v ${{ github.workspace }}:/build -w /build
run: ${{ inputs.build }}
- name: Build
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup-codecov-rust/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ inputs:
runs:
using: "composite"
steps:
- name: Install nightly 1.71
- name: Install nightly 1.72
uses: actions-rs/toolchain@v1
with:
toolchain: nightly-2023-05-08
toolchain: nightly-2023-08-24
override: true
- uses: Swatinem/rust-cache@v2
- name: "Install dependencies"
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ jobs:
strip *.node
- host: ubuntu-20.04
target: x86_64-unknown-linux-musl
docker: ghcr.io/hyperledger/aries-vcx/napi-rs-alpine
docker: alpine
build: |-
set -e
env
Expand Down Expand Up @@ -550,7 +550,6 @@ jobs:
build: ${{ matrix.settings.build }}
node-version: ${{ env.NODE_VERSION }}
rust-version: ${{ env.RUST_TOOLCHAIN_VERSION }}
default: true

publish-napi:
runs-on: ubuntu-20.04
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ test-unit test_name="":
test-integration-aries-vcx-core features:
cargo test --manifest-path="aries/aries_vcx_core/Cargo.toml" -F {{features}}

test-integration-aries-vcx test_name="" features:
test-integration-aries-vcx features test_name="":
cargo test --manifest-path="aries/aries_vcx/Cargo.toml" -F {{features}} -- --ignored {{test_name}}

test-integration-aries-vcx-anoncreds-rs test_name="":
Expand Down

0 comments on commit 76876a7

Please sign in to comment.