From b473719d1ccee5122e695f4f3d233df63f919da8 Mon Sep 17 00:00:00 2001 From: Adam Spofford Date: Wed, 14 Aug 2024 10:03:21 -0700 Subject: [PATCH 1/5] update deprecated actions --- .github/workflows/ci.yaml | 8 ++++---- .github/workflows/e2e.yaml | 10 +++++----- .github/workflows/fmt.yaml | 8 ++++---- .github/workflows/lint.yaml | 10 +++++----- .github/workflows/shellcheck.yml | 6 +++--- .github/workflows/test.yml | 10 +++++----- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6d94971..8f00605 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -10,8 +10,8 @@ jobs: outputs: filter: ${{ steps.filter.outputs.demo == 'true' || steps.filter.outputs.workflows == 'true' }} steps: - - uses: actions/checkout@v2 - - uses: dorny/paths-filter@v2 + - uses: actions/checkout@v4 + - uses: dorny/paths-filter@v3 id: filter with: filters: .github/filters.yml @@ -26,7 +26,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install dfx uses: dfinity/setup-dfx@main @@ -34,7 +34,7 @@ jobs: dfx-version: "0.9.2" - name: Install Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index eb83e04..00e6a45 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -11,8 +11,8 @@ jobs: outputs: filter: ${{ steps.filter.outputs.e2e == 'true' || steps.filter.outputs.workflows == 'true' }} steps: - - uses: actions/checkout@v2 - - uses: dorny/paths-filter@v2 + - uses: actions/checkout@v4 + - uses: dorny/paths-filter@v3 id: filter with: filters: .github/filters.yml @@ -30,12 +30,12 @@ jobs: DFX_VERSION: ${{ matrix.dfx }} steps: - - uses: actions/checkout@v1 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 16 - name: Cache Cargo - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.cargo/registry diff --git a/.github/workflows/fmt.yaml b/.github/workflows/fmt.yaml index 8b48abd..ad9ebd3 100644 --- a/.github/workflows/fmt.yaml +++ b/.github/workflows/fmt.yaml @@ -8,8 +8,8 @@ jobs: outputs: filter: ${{ steps.filter.outputs.backend == 'true' || steps.filter.outputs.workflows == 'true' }} steps: - - uses: actions/checkout@v2 - - uses: dorny/paths-filter@v2 + - uses: actions/checkout@v4 + - uses: dorny/paths-filter@v3 id: filter with: filters: .github/filters.yml @@ -23,9 +23,9 @@ jobs: os: [ ubuntu-latest ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: | ~/.cargo/registry diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index a5f5faa..6fcf9b8 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -8,8 +8,8 @@ jobs: outputs: filter: ${{ steps.filter.outputs.backend == 'true' || steps.filter.outputs.workflows == 'true' }} steps: - - uses: actions/checkout@v2 - - uses: dorny/paths-filter@v2 + - uses: actions/checkout@v4 + - uses: dorny/paths-filter@v3 id: filter with: filters: .github/filters.yml @@ -25,9 +25,9 @@ jobs: node-version: ['12.x'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: path: | ~/.cargo/registry @@ -39,7 +39,7 @@ jobs: with: dfx-version: "0.9.2" - name: Install Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Run Lint diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index b4c6a03..6da0a59 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -11,8 +11,8 @@ jobs: outputs: filter: ${{ steps.filter.outputs.shell == 'true' || steps.filter.outputs.workflows == 'true' }} steps: - - uses: actions/checkout@v2 - - uses: dorny/paths-filter@v2 + - uses: actions/checkout@v4 + - uses: dorny/paths-filter@v3 id: filter with: filters: .github/filters.yml @@ -23,7 +23,7 @@ jobs: name: Check shell scripts runs-on: macos-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install shellcheck run: | mkdir $HOME/bin diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 14de511..14d1922 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,8 +11,8 @@ jobs: outputs: filter: ${{ steps.filter.outputs.backend == 'true' || steps.filter.outputs.workflows == 'true' }} steps: - - uses: actions/checkout@v2 - - uses: dorny/paths-filter@v2 + - uses: actions/checkout@v4 + - uses: dorny/paths-filter@v3 id: filter with: filters: .github/filters.yml @@ -26,8 +26,8 @@ jobs: os: [ubuntu-latest, macos-latest] node-version: ['12.x'] steps: - - uses: actions/checkout@v1 - - uses: actions/cache@v2 + - uses: actions/checkout@v4 + - uses: actions/cache@v4 with: path: | ~/.cargo/registry @@ -39,7 +39,7 @@ jobs: with: dfx-version: "0.9.2" - name: Install Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Run tests From aaa87aff5340a337eee1731451184ab7b48c78e7 Mon Sep 17 00:00:00 2001 From: Adam Spofford Date: Wed, 14 Aug 2024 10:09:17 -0700 Subject: [PATCH 2/5] sigh --- .github/workflows/e2e.yaml | 6 +++--- .github/workflows/shellcheck.yml | 2 +- .github/workflows/test.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 00e6a45..a282903 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ macos-latest, ubuntu-latest ] + os: [ macos-12-large, ubuntu-20.04 ] # only dfx >= 0.8.3 lets us query multiple controllers dfx: [ '0.9.2' ] env: @@ -43,10 +43,10 @@ jobs: ./target key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-${{ matrix.rust }}-1 - name: Provision Darwin - if: matrix.os == 'macos-latest' + if: ${{ contains(matrix.os, 'macos') }} run: bash .github/workflows/provision-darwin.sh - name: Provision Linux - if: matrix.os == 'ubuntu-latest' + if: ${{ contains(matrix.os, 'ubuntu') }} run: bash .github/workflows/provision-linux.sh - name: Install dfx uses: dfinity/setup-dfx@main diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 6da0a59..f03210d 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -21,7 +21,7 @@ jobs: needs: filter if: ${{ needs.filter.outputs.filter == 'true' }} name: Check shell scripts - runs-on: macos-latest + runs-on: macos-12-large steps: - uses: actions/checkout@v4 - name: Install shellcheck diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 14d1922..18ecdc2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-20.04, macos-12-large] node-version: ['12.x'] steps: - uses: actions/checkout@v4 From 8a8916446aaf650bf82c09fb021725e52ade7076 Mon Sep 17 00:00:00 2001 From: Adam Spofford Date: Wed, 14 Aug 2024 10:22:37 -0700 Subject: [PATCH 3/5] . --- rust-toolchain.toml | 2 +- wallet/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index b959a67..6372b5f 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,4 @@ [toolchain] -channel = "1.74.1" +channel = "1.79.0" components = ["clippy", "rustfmt"] targets = ["wasm32-unknown-unknown"] diff --git a/wallet/build.sh b/wallet/build.sh index 76ffe5d..5ed16be 100755 --- a/wallet/build.sh +++ b/wallet/build.sh @@ -15,7 +15,7 @@ gzip -f dist/*.js # Disable modern wasm features so the wallet binary will run on dfx 0.9.2's bundled replica cargo rustc -p wallet --target wasm32-unknown-unknown --release -- -Ctarget-cpu=mvp -Ctarget-feature=-sign-ext -cargo install ic-wasm --root target --locked +cargo install ic-wasm --root target --locked --version 0.8.0 STATUS=$? if [ "$STATUS" -eq "0" ]; then From d33315ba8ff19b044d3b530b0c344c33d3930c38 Mon Sep 17 00:00:00 2001 From: Adam Spofford Date: Wed, 14 Aug 2024 10:45:02 -0700 Subject: [PATCH 4/5] ? --- .github/workflows/e2e.yaml | 2 +- .github/workflows/shellcheck.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index a282903..e7e2886 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ macos-12-large, ubuntu-20.04 ] + os: [ macos-14-large, ubuntu-20.04 ] # only dfx >= 0.8.3 lets us query multiple controllers dfx: [ '0.9.2' ] env: diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index f03210d..1d98f17 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -21,7 +21,7 @@ jobs: needs: filter if: ${{ needs.filter.outputs.filter == 'true' }} name: Check shell scripts - runs-on: macos-12-large + runs-on: macos-14-large steps: - uses: actions/checkout@v4 - name: Install shellcheck From 40a72e6ead84c73507ec27a2d2be614196103054 Mon Sep 17 00:00:00 2001 From: Adam Spofford Date: Wed, 14 Aug 2024 11:09:34 -0700 Subject: [PATCH 5/5] . --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 18ecdc2..8389f47 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, macos-12-large] + os: [ubuntu-20.04, macos-14-large] node-version: ['12.x'] steps: - uses: actions/checkout@v4