From e6352b31160430e3f36f7aa83ff79e617445c39c Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 15 Nov 2023 12:54:17 +0100 Subject: [PATCH 1/9] Update checkout to v4 --- .github/workflows/fuzz-nightly.yml | 2 +- .../pull-request-account-compression.yml | 4 ++-- .../pull-request-binary-oracle-pair.yml | 2 +- .github/workflows/pull-request-docs.yml | 4 ++-- .github/workflows/pull-request-examples.yml | 2 +- .github/workflows/pull-request-feature-gate.yml | 2 +- .../workflows/pull-request-feature-proposal.yml | 2 +- .github/workflows/pull-request-governance.yml | 2 +- .../pull-request-instruction-padding.yml | 2 +- .github/workflows/pull-request-js.yml | 2 +- .github/workflows/pull-request-libraries.yml | 4 ++-- .github/workflows/pull-request-memo.yml | 4 ++-- .github/workflows/pull-request-name-service.yml | 4 ++-- .github/workflows/pull-request-record.yml | 2 +- .github/workflows/pull-request-shared-memory.yml | 2 +- .github/workflows/pull-request-single-pool.yml | 6 +++--- .github/workflows/pull-request-stake-pool.yml | 6 +++--- .../workflows/pull-request-token-collection.yml | 2 +- .github/workflows/pull-request-token-group.yml | 2 +- .github/workflows/pull-request-token-lending.yml | 4 ++-- .../workflows/pull-request-token-metadata.yml | 4 ++-- .github/workflows/pull-request-token-swap.yml | 6 +++--- .github/workflows/pull-request-token-upgrade.yml | 4 ++-- .github/workflows/pull-request-token.yml | 16 ++++++++-------- .github/workflows/pull-request.yml | 8 ++++---- .github/workflows/spl_action.yml | 2 +- 26 files changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/fuzz-nightly.yml b/.github/workflows/fuzz-nightly.yml index 43d6a6c4883..0ed91d61b18 100644 --- a/.github/workflows/fuzz-nightly.yml +++ b/.github/workflows/fuzz-nightly.yml @@ -12,7 +12,7 @@ jobs: fuzz_target: [token-swap-instructions] fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-account-compression.yml b/.github/workflows/pull-request-account-compression.yml index b91a0b65a6a..b19ccd91f44 100644 --- a/.github/workflows/pull-request-account-compression.yml +++ b/.github/workflows/pull-request-account-compression.yml @@ -21,7 +21,7 @@ jobs: anchor-build-account-compression: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -78,7 +78,7 @@ jobs: NODE_VERSION: 16.x needs: anchor-build-account-compression steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v1 with: diff --git a/.github/workflows/pull-request-binary-oracle-pair.yml b/.github/workflows/pull-request-binary-oracle-pair.yml index 3794607ace9..d88b7f09054 100644 --- a/.github/workflows/pull-request-binary-oracle-pair.yml +++ b/.github/workflows/pull-request-binary-oracle-pair.yml @@ -17,7 +17,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-docs.yml b/.github/workflows/pull-request-docs.yml index 4bae66ab877..ca39ed82f10 100644 --- a/.github/workflows/pull-request-docs.yml +++ b/.github/workflows/pull-request-docs.yml @@ -27,7 +27,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 2 @@ -49,7 +49,7 @@ jobs: build_docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: actions/setup-node@v2 with: node-version: '18' diff --git a/.github/workflows/pull-request-examples.yml b/.github/workflows/pull-request-examples.yml index 3f7e06b26e2..22749e01b9f 100644 --- a/.github/workflows/pull-request-examples.yml +++ b/.github/workflows/pull-request-examples.yml @@ -15,7 +15,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-feature-gate.yml b/.github/workflows/pull-request-feature-gate.yml index dbe807348aa..dbe00332f62 100644 --- a/.github/workflows/pull-request-feature-gate.yml +++ b/.github/workflows/pull-request-feature-gate.yml @@ -17,7 +17,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-feature-proposal.yml b/.github/workflows/pull-request-feature-proposal.yml index f401d99892e..66974c9b799 100644 --- a/.github/workflows/pull-request-feature-proposal.yml +++ b/.github/workflows/pull-request-feature-proposal.yml @@ -17,7 +17,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-governance.yml b/.github/workflows/pull-request-governance.yml index 3823bd59d34..d9cd2371d8b 100644 --- a/.github/workflows/pull-request-governance.yml +++ b/.github/workflows/pull-request-governance.yml @@ -27,7 +27,7 @@ jobs: sudo rm -rf "/usr/local/share/boost" sudo rm -rf "$AGENT_TOOLSDIRECTORY" - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-instruction-padding.yml b/.github/workflows/pull-request-instruction-padding.yml index 355260469c8..204eec7d48d 100644 --- a/.github/workflows/pull-request-instruction-padding.yml +++ b/.github/workflows/pull-request-instruction-padding.yml @@ -17,7 +17,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-js.yml b/.github/workflows/pull-request-js.yml index ed747a7e16f..63d13d72c71 100644 --- a/.github/workflows/pull-request-js.yml +++ b/.github/workflows/pull-request-js.yml @@ -37,7 +37,7 @@ jobs: env: NODE_VERSION: 20.5 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: diff --git a/.github/workflows/pull-request-libraries.yml b/.github/workflows/pull-request-libraries.yml index 53226ba3c64..4a407e69a20 100644 --- a/.github/workflows/pull-request-libraries.yml +++ b/.github/workflows/pull-request-libraries.yml @@ -17,7 +17,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -64,7 +64,7 @@ jobs: env: NODE_VERSION: 16.x steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: diff --git a/.github/workflows/pull-request-memo.yml b/.github/workflows/pull-request-memo.yml index 78c0d62bf15..53521ed1289 100644 --- a/.github/workflows/pull-request-memo.yml +++ b/.github/workflows/pull-request-memo.yml @@ -17,7 +17,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -64,7 +64,7 @@ jobs: env: NODE_VERSION: 16.x steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: diff --git a/.github/workflows/pull-request-name-service.yml b/.github/workflows/pull-request-name-service.yml index f3d2ce06f9c..85d5490867b 100644 --- a/.github/workflows/pull-request-name-service.yml +++ b/.github/workflows/pull-request-name-service.yml @@ -17,7 +17,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -71,7 +71,7 @@ jobs: env: NODE_VERSION: 16.x steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: diff --git a/.github/workflows/pull-request-record.yml b/.github/workflows/pull-request-record.yml index fe4e76e31c1..5851e33f598 100644 --- a/.github/workflows/pull-request-record.yml +++ b/.github/workflows/pull-request-record.yml @@ -15,7 +15,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-shared-memory.yml b/.github/workflows/pull-request-shared-memory.yml index 6000ec91919..6f191f54c70 100644 --- a/.github/workflows/pull-request-shared-memory.yml +++ b/.github/workflows/pull-request-shared-memory.yml @@ -15,7 +15,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-single-pool.yml b/.github/workflows/pull-request-single-pool.yml index c1ab2f6a398..500b0fe1dda 100644 --- a/.github/workflows/pull-request-single-pool.yml +++ b/.github/workflows/pull-request-single-pool.yml @@ -23,7 +23,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -75,7 +75,7 @@ jobs: cargo-build-test-cli: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -122,7 +122,7 @@ jobs: env: NODE_VERSION: 20.5 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: diff --git a/.github/workflows/pull-request-stake-pool.yml b/.github/workflows/pull-request-stake-pool.yml index a912b5b338f..6a3f54a7c10 100644 --- a/.github/workflows/pull-request-stake-pool.yml +++ b/.github/workflows/pull-request-stake-pool.yml @@ -23,7 +23,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Check disk space run: df -h @@ -86,7 +86,7 @@ jobs: env: NODE_VERSION: 16.x steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: @@ -106,7 +106,7 @@ jobs: runs-on: ubuntu-latest needs: cargo-test-sbf steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup Python version uses: actions/setup-python@v2 diff --git a/.github/workflows/pull-request-token-collection.yml b/.github/workflows/pull-request-token-collection.yml index 6e305446c72..5ccba4f6acb 100644 --- a/.github/workflows/pull-request-token-collection.yml +++ b/.github/workflows/pull-request-token-collection.yml @@ -23,7 +23,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-token-group.yml b/.github/workflows/pull-request-token-group.yml index fce03fe5d22..e3fe2c24a27 100644 --- a/.github/workflows/pull-request-token-group.yml +++ b/.github/workflows/pull-request-token-group.yml @@ -19,7 +19,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-token-lending.yml b/.github/workflows/pull-request-token-lending.yml index dd04417215e..fa3e0e4c3c8 100644 --- a/.github/workflows/pull-request-token-lending.yml +++ b/.github/workflows/pull-request-token-lending.yml @@ -19,7 +19,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -73,7 +73,7 @@ jobs: env: NODE_VERSION: 18.x steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: diff --git a/.github/workflows/pull-request-token-metadata.yml b/.github/workflows/pull-request-token-metadata.yml index ef91340a585..7c8d076deb9 100644 --- a/.github/workflows/pull-request-token-metadata.yml +++ b/.github/workflows/pull-request-token-metadata.yml @@ -21,7 +21,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -75,7 +75,7 @@ jobs: env: NODE_VERSION: 16.x steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: diff --git a/.github/workflows/pull-request-token-swap.yml b/.github/workflows/pull-request-token-swap.yml index f2149696bce..9eaa30b8f60 100644 --- a/.github/workflows/pull-request-token-swap.yml +++ b/.github/workflows/pull-request-token-swap.yml @@ -21,7 +21,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -88,7 +88,7 @@ jobs: env: NODE_VERSION: 16.x steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: @@ -107,7 +107,7 @@ jobs: fuzz: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-token-upgrade.yml b/.github/workflows/pull-request-token-upgrade.yml index f1b321a4d17..ceeb1ff3683 100644 --- a/.github/workflows/pull-request-token-upgrade.yml +++ b/.github/workflows/pull-request-token-upgrade.yml @@ -19,7 +19,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -64,7 +64,7 @@ jobs: cargo-build-test-cli: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request-token.yml b/.github/workflows/pull-request-token.yml index 325f7861e41..688306f2175 100644 --- a/.github/workflows/pull-request-token.yml +++ b/.github/workflows/pull-request-token.yml @@ -21,7 +21,7 @@ jobs: cargo-test-sbf: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Remove unneeded packages for more space run: bash ./ci/warning/purge-ubuntu-runner.sh @@ -76,7 +76,7 @@ jobs: cargo-test-token-2022-serde: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -108,7 +108,7 @@ jobs: cargo-test-sbf-transfer-hook: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -160,7 +160,7 @@ jobs: cargo-test-sbf-associated-token-account: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -212,7 +212,7 @@ jobs: cargo-test-sbf-twoxtx: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Remove unneeded packages for more space run: bash ./ci/warning/purge-ubuntu-runner.sh @@ -256,7 +256,7 @@ jobs: env: NODE_VERSION: 16.x steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} uses: actions/setup-node@v3 with: @@ -275,7 +275,7 @@ jobs: cargo-build-test-cli: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -317,7 +317,7 @@ jobs: runs-on: ubuntu-latest needs: [cargo-test-sbf] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 20c15c72fc7..2086e5838c3 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -23,7 +23,7 @@ jobs: rustfmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -46,7 +46,7 @@ jobs: clippy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -82,7 +82,7 @@ jobs: audit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set env vars run: | @@ -107,7 +107,7 @@ jobs: cargo-build-test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Remove unneeded packages for more space run: bash ./ci/warning/purge-ubuntu-runner.sh diff --git a/.github/workflows/spl_action.yml b/.github/workflows/spl_action.yml index fbff6275fe3..c1d6c51a03a 100644 --- a/.github/workflows/spl_action.yml +++ b/.github/workflows/spl_action.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 name: "importing all the document" - uses: actions/setup-node@v2 with: From df7168d9b9f91984fb6837cbd683bd5b446a63a1 Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 15 Nov 2023 12:57:42 +0100 Subject: [PATCH 2/9] Update cache action to v3 --- .github/workflows/fuzz-nightly.yml | 6 ++-- .../pull-request-account-compression.yml | 8 ++--- .../pull-request-binary-oracle-pair.yml | 6 ++-- .github/workflows/pull-request-examples.yml | 6 ++-- .../workflows/pull-request-feature-gate.yml | 6 ++-- .../pull-request-feature-proposal.yml | 6 ++-- .github/workflows/pull-request-governance.yml | 6 ++-- .../pull-request-instruction-padding.yml | 6 ++-- .github/workflows/pull-request-js.yml | 2 +- .github/workflows/pull-request-libraries.yml | 8 ++--- .github/workflows/pull-request-memo.yml | 8 ++--- .../workflows/pull-request-name-service.yml | 8 ++--- .github/workflows/pull-request-record.yml | 6 ++-- .../workflows/pull-request-shared-memory.yml | 6 ++-- .../workflows/pull-request-single-pool.yml | 12 +++---- .github/workflows/pull-request-stake-pool.yml | 10 +++--- .../pull-request-token-collection.yml | 6 ++-- .../workflows/pull-request-token-group.yml | 6 ++-- .../workflows/pull-request-token-lending.yml | 8 ++--- .../workflows/pull-request-token-metadata.yml | 8 ++--- .github/workflows/pull-request-token-swap.yml | 14 ++++---- .../workflows/pull-request-token-upgrade.yml | 10 +++--- .github/workflows/pull-request-token.yml | 32 +++++++++---------- .github/workflows/pull-request.yml | 8 ++--- 24 files changed, 101 insertions(+), 101 deletions(-) diff --git a/.github/workflows/fuzz-nightly.yml b/.github/workflows/fuzz-nightly.yml index 0ed91d61b18..b0bf7424249 100644 --- a/.github/workflows/fuzz-nightly.yml +++ b/.github/workflows/fuzz-nightly.yml @@ -27,7 +27,7 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry @@ -35,14 +35,14 @@ jobs: target key: cargo-fuzz-${{ hashFiles('**/Cargo.lock') }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/cargo-hfuzz ~/.cargo/bin/cargo-honggfuzz key: cargo-fuzz-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-account-compression.yml b/.github/workflows/pull-request-account-compression.yml index b19ccd91f44..563b13741d0 100644 --- a/.github/workflows/pull-request-account-compression.yml +++ b/.github/workflows/pull-request-account-compression.yml @@ -38,20 +38,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -83,7 +83,7 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ env.NODE_VERSION }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/yarn key: node-${{ hashFiles('account-compression/sdk/yarn.lock') }} diff --git a/.github/workflows/pull-request-binary-oracle-pair.yml b/.github/workflows/pull-request-binary-oracle-pair.yml index d88b7f09054..b4edb6cc0ab 100644 --- a/.github/workflows/pull-request-binary-oracle-pair.yml +++ b/.github/workflows/pull-request-binary-oracle-pair.yml @@ -32,20 +32,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-examples.yml b/.github/workflows/pull-request-examples.yml index 22749e01b9f..ec7403c2ef3 100644 --- a/.github/workflows/pull-request-examples.yml +++ b/.github/workflows/pull-request-examples.yml @@ -30,20 +30,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-feature-gate.yml b/.github/workflows/pull-request-feature-gate.yml index dbe00332f62..003680e1106 100644 --- a/.github/workflows/pull-request-feature-gate.yml +++ b/.github/workflows/pull-request-feature-gate.yml @@ -32,20 +32,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-feature-proposal.yml b/.github/workflows/pull-request-feature-proposal.yml index 66974c9b799..a465d39ae83 100644 --- a/.github/workflows/pull-request-feature-proposal.yml +++ b/.github/workflows/pull-request-feature-proposal.yml @@ -32,20 +32,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-governance.yml b/.github/workflows/pull-request-governance.yml index d9cd2371d8b..a137fc3f731 100644 --- a/.github/workflows/pull-request-governance.yml +++ b/.github/workflows/pull-request-governance.yml @@ -42,20 +42,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-instruction-padding.yml b/.github/workflows/pull-request-instruction-padding.yml index 204eec7d48d..26de8896bdc 100644 --- a/.github/workflows/pull-request-instruction-padding.yml +++ b/.github/workflows/pull-request-instruction-padding.yml @@ -32,20 +32,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-js.yml b/.github/workflows/pull-request-js.yml index 63d13d72c71..7927f53a884 100644 --- a/.github/workflows/pull-request-js.yml +++ b/.github/workflows/pull-request-js.yml @@ -45,7 +45,7 @@ jobs: - uses: pnpm/action-setup@v2 with: version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.npm key: node-${{ hashFiles('pnpm-lock.yaml') }} diff --git a/.github/workflows/pull-request-libraries.yml b/.github/workflows/pull-request-libraries.yml index 4a407e69a20..cdc52217161 100644 --- a/.github/workflows/pull-request-libraries.yml +++ b/.github/workflows/pull-request-libraries.yml @@ -32,20 +32,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -72,7 +72,7 @@ jobs: - uses: pnpm/action-setup@v2 with: version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.npm key: node-${{ hashFiles('pnpm-lock.yaml') }} diff --git a/.github/workflows/pull-request-memo.yml b/.github/workflows/pull-request-memo.yml index 53521ed1289..49d5700c177 100644 --- a/.github/workflows/pull-request-memo.yml +++ b/.github/workflows/pull-request-memo.yml @@ -32,20 +32,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -72,7 +72,7 @@ jobs: - uses: pnpm/action-setup@v2 with: version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.npm key: node-${{ hashFiles('pnpm-lock.yaml') }} diff --git a/.github/workflows/pull-request-name-service.yml b/.github/workflows/pull-request-name-service.yml index 85d5490867b..49ead09ecba 100644 --- a/.github/workflows/pull-request-name-service.yml +++ b/.github/workflows/pull-request-name-service.yml @@ -32,20 +32,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -79,7 +79,7 @@ jobs: - uses: pnpm/action-setup@v2 with: version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.npm key: node-${{ hashFiles('pnpm-lock.yaml') }} diff --git a/.github/workflows/pull-request-record.yml b/.github/workflows/pull-request-record.yml index 5851e33f598..47336d4be28 100644 --- a/.github/workflows/pull-request-record.yml +++ b/.github/workflows/pull-request-record.yml @@ -30,20 +30,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-shared-memory.yml b/.github/workflows/pull-request-shared-memory.yml index 6f191f54c70..9d3408b041b 100644 --- a/.github/workflows/pull-request-shared-memory.yml +++ b/.github/workflows/pull-request-shared-memory.yml @@ -30,20 +30,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-single-pool.yml b/.github/workflows/pull-request-single-pool.yml index 500b0fe1dda..8e1f651e6f7 100644 --- a/.github/workflows/pull-request-single-pool.yml +++ b/.github/workflows/pull-request-single-pool.yml @@ -38,20 +38,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -90,14 +90,14 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -130,7 +130,7 @@ jobs: - uses: pnpm/action-setup@v2 with: version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.npm key: node-${{ hashFiles('pnpm-lock.yaml') }} diff --git a/.github/workflows/pull-request-stake-pool.yml b/.github/workflows/pull-request-stake-pool.yml index 6a3f54a7c10..c0a7d0b1813 100644 --- a/.github/workflows/pull-request-stake-pool.yml +++ b/.github/workflows/pull-request-stake-pool.yml @@ -47,20 +47,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -94,7 +94,7 @@ jobs: - uses: pnpm/action-setup@v2 with: version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.npm key: node-${{ hashFiles('pnpm-lock.yaml') }} @@ -113,7 +113,7 @@ jobs: with: python-version: 3.8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/pip key: pip-stake-pool-${{ hashFiles('stake-pool/py/requirements.txt') }} diff --git a/.github/workflows/pull-request-token-collection.yml b/.github/workflows/pull-request-token-collection.yml index 5ccba4f6acb..14ab6599dfd 100644 --- a/.github/workflows/pull-request-token-collection.yml +++ b/.github/workflows/pull-request-token-collection.yml @@ -38,20 +38,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-token-group.yml b/.github/workflows/pull-request-token-group.yml index e3fe2c24a27..5c7c60abb6e 100644 --- a/.github/workflows/pull-request-token-group.yml +++ b/.github/workflows/pull-request-token-group.yml @@ -34,20 +34,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-token-lending.yml b/.github/workflows/pull-request-token-lending.yml index fa3e0e4c3c8..c03c38b5937 100644 --- a/.github/workflows/pull-request-token-lending.yml +++ b/.github/workflows/pull-request-token-lending.yml @@ -34,20 +34,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -81,7 +81,7 @@ jobs: - uses: pnpm/action-setup@v2 with: version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.npm key: node-${{ hashFiles('pnpm-lock.yaml') }} diff --git a/.github/workflows/pull-request-token-metadata.yml b/.github/workflows/pull-request-token-metadata.yml index 7c8d076deb9..f1a0382609a 100644 --- a/.github/workflows/pull-request-token-metadata.yml +++ b/.github/workflows/pull-request-token-metadata.yml @@ -36,20 +36,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -83,7 +83,7 @@ jobs: - uses: pnpm/action-setup@v2 with: version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.npm key: node-${{ hashFiles('pnpm-lock.yaml') }} diff --git a/.github/workflows/pull-request-token-swap.yml b/.github/workflows/pull-request-token-swap.yml index 9eaa30b8f60..a3d6e3a8aff 100644 --- a/.github/workflows/pull-request-token-swap.yml +++ b/.github/workflows/pull-request-token-swap.yml @@ -36,20 +36,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -96,7 +96,7 @@ jobs: - uses: pnpm/action-setup@v2 with: version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.npm key: node-${{ hashFiles('pnpm-lock.yaml') }} @@ -122,21 +122,21 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: token-swap-fuzz-${{ hashFiles('**/Cargo.lock') }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/cargo-hfuzz ~/.cargo/bin/cargo-honggfuzz key: cargo-fuzz-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cache diff --git a/.github/workflows/pull-request-token-upgrade.yml b/.github/workflows/pull-request-token-upgrade.yml index ceeb1ff3683..e4c81960789 100644 --- a/.github/workflows/pull-request-token-upgrade.yml +++ b/.github/workflows/pull-request-token-upgrade.yml @@ -34,20 +34,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -79,14 +79,14 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request-token.yml b/.github/workflows/pull-request-token.yml index 688306f2175..5a00f91a817 100644 --- a/.github/workflows/pull-request-token.yml +++ b/.github/workflows/pull-request-token.yml @@ -39,20 +39,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -91,7 +91,7 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry @@ -123,20 +123,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -175,20 +175,20 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -231,7 +231,7 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry @@ -264,7 +264,7 @@ jobs: - uses: pnpm/action-setup@v2 with: version: 8 - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.npm key: node-${{ hashFiles('pnpm-lock.yaml') }} @@ -290,14 +290,14 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} @@ -332,14 +332,14 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry ~/.cargo/git key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 2086e5838c3..aa89c25c622 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -60,7 +60,7 @@ jobs: profile: minimal components: clippy - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry @@ -125,7 +125,7 @@ jobs: override: true profile: minimal - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/registry @@ -133,13 +133,13 @@ jobs: # target # Removed due to build dependency caching conflicts key: cargo-build-${{ hashFiles('**/Cargo.lock') }}-${{ env.RUST_STABLE}} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: | ~/.cargo/bin/rustfilt key: cargo-sbf-bins-${{ runner.os }} - - uses: actions/cache@v2 + - uses: actions/cache@v3 with: path: ~/.cache/solana key: solana-${{ env.SOLANA_VERSION }} From 96e0dcacd3b04ef0629f2d0900abe2602bfb6f7f Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 15 Nov 2023 12:59:10 +0100 Subject: [PATCH 3/9] Update upload-artifact to v3 --- .github/workflows/pull-request-account-compression.yml | 2 +- .github/workflows/pull-request-name-service.yml | 2 +- .github/workflows/pull-request-single-pool.yml | 2 +- .github/workflows/pull-request-stake-pool.yml | 2 +- .github/workflows/pull-request-token-lending.yml | 2 +- .github/workflows/pull-request-token-swap.yml | 2 +- .github/workflows/pull-request-token.yml | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pull-request-account-compression.yml b/.github/workflows/pull-request-account-compression.yml index 563b13741d0..48c3f37a96d 100644 --- a/.github/workflows/pull-request-account-compression.yml +++ b/.github/workflows/pull-request-account-compression.yml @@ -66,7 +66,7 @@ jobs: run: ./ci/cargo-test-sbf.sh account-compression - name: Upload programs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: account-compression-programs path: "account-compression/target/deploy/*.so" diff --git a/.github/workflows/pull-request-name-service.yml b/.github/workflows/pull-request-name-service.yml index 49ead09ecba..34f779db616 100644 --- a/.github/workflows/pull-request-name-service.yml +++ b/.github/workflows/pull-request-name-service.yml @@ -60,7 +60,7 @@ jobs: run: ./ci/cargo-test-sbf.sh name-service - name: Upload programs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: name-service-programs path: "target/deploy/*.so" diff --git a/.github/workflows/pull-request-single-pool.yml b/.github/workflows/pull-request-single-pool.yml index 8e1f651e6f7..2dc5798e4d2 100644 --- a/.github/workflows/pull-request-single-pool.yml +++ b/.github/workflows/pull-request-single-pool.yml @@ -66,7 +66,7 @@ jobs: run: ./ci/cargo-test-sbf.sh single-pool/program - name: Upload programs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: single-pool-programs path: "target/deploy/*.so" diff --git a/.github/workflows/pull-request-stake-pool.yml b/.github/workflows/pull-request-stake-pool.yml index c0a7d0b1813..acb7d2bb30a 100644 --- a/.github/workflows/pull-request-stake-pool.yml +++ b/.github/workflows/pull-request-stake-pool.yml @@ -75,7 +75,7 @@ jobs: run: ./ci/cargo-test-sbf.sh stake-pool - name: Upload programs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: stake-pool-programs path: "target/deploy/*.so" diff --git a/.github/workflows/pull-request-token-lending.yml b/.github/workflows/pull-request-token-lending.yml index c03c38b5937..40861bcd715 100644 --- a/.github/workflows/pull-request-token-lending.yml +++ b/.github/workflows/pull-request-token-lending.yml @@ -62,7 +62,7 @@ jobs: run: ./ci/cargo-test-sbf.sh token-lending - name: Upload programs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: token-lending-programs path: "target/deploy/*.so" diff --git a/.github/workflows/pull-request-token-swap.yml b/.github/workflows/pull-request-token-swap.yml index a3d6e3a8aff..3b375ac02f3 100644 --- a/.github/workflows/pull-request-token-swap.yml +++ b/.github/workflows/pull-request-token-swap.yml @@ -77,7 +77,7 @@ jobs: mv target/deploy-production/spl_token_swap.so target/deploy/spl_token_swap_production.so - name: Upload programs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: token-swap-programs path: "target/deploy/*.so" diff --git a/.github/workflows/pull-request-token.yml b/.github/workflows/pull-request-token.yml index 5a00f91a817..53eda7d66ce 100644 --- a/.github/workflows/pull-request-token.yml +++ b/.github/workflows/pull-request-token.yml @@ -67,7 +67,7 @@ jobs: run: ./ci/cargo-test-sbf.sh token - name: Upload programs - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: token-programs path: "target/deploy/*.so" @@ -151,7 +151,7 @@ jobs: run: ./ci/cargo-test-sbf.sh token/transfer-hook/example - name: Upload program - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: spl-transfer-hook-example path: "target/deploy/*.so" @@ -203,7 +203,7 @@ jobs: run: ./ci/cargo-test-sbf.sh associated-token-account - name: Upload program - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: associated-token-account-program path: "target/deploy/*.so" From 4e3d94d532a9cd61b995a972eb2a1fe0284ecb43 Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 15 Nov 2023 13:11:12 +0100 Subject: [PATCH 4/9] Update to dtolnay/rust-toolchain --- .github/workflows/fuzz-nightly.yml | 4 +-- .../pull-request-account-compression.yml | 4 +-- .../pull-request-binary-oracle-pair.yml | 4 +-- .github/workflows/pull-request-examples.yml | 4 +-- .../workflows/pull-request-feature-gate.yml | 4 +-- .../pull-request-feature-proposal.yml | 4 +-- .github/workflows/pull-request-governance.yml | 4 +-- .../pull-request-instruction-padding.yml | 4 +-- .github/workflows/pull-request-libraries.yml | 4 +-- .github/workflows/pull-request-memo.yml | 4 +-- .../workflows/pull-request-name-service.yml | 4 +-- .github/workflows/pull-request-record.yml | 4 +-- .../workflows/pull-request-shared-memory.yml | 4 +-- .../workflows/pull-request-single-pool.yml | 8 ++---- .github/workflows/pull-request-stake-pool.yml | 4 +-- .../pull-request-token-collection.yml | 4 +-- .../workflows/pull-request-token-group.yml | 4 +-- .../workflows/pull-request-token-lending.yml | 4 +-- .../workflows/pull-request-token-metadata.yml | 4 +-- .github/workflows/pull-request-token-swap.yml | 8 ++---- .../workflows/pull-request-token-upgrade.yml | 8 ++---- .github/workflows/pull-request-token.yml | 28 +++++-------------- .github/workflows/pull-request.yml | 16 +++-------- 23 files changed, 35 insertions(+), 105 deletions(-) diff --git a/.github/workflows/fuzz-nightly.yml b/.github/workflows/fuzz-nightly.yml index b0bf7424249..639c58b0407 100644 --- a/.github/workflows/fuzz-nightly.yml +++ b/.github/workflows/fuzz-nightly.yml @@ -21,11 +21,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-account-compression.yml b/.github/workflows/pull-request-account-compression.yml index 48c3f37a96d..90c4fd5cf41 100644 --- a/.github/workflows/pull-request-account-compression.yml +++ b/.github/workflows/pull-request-account-compression.yml @@ -32,11 +32,9 @@ jobs: source ci/install-anchor.sh echo "ANCHOR_CLI_VERSION=$anchor_cli_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-binary-oracle-pair.yml b/.github/workflows/pull-request-binary-oracle-pair.yml index b4edb6cc0ab..6c8e4e32bbd 100644 --- a/.github/workflows/pull-request-binary-oracle-pair.yml +++ b/.github/workflows/pull-request-binary-oracle-pair.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-examples.yml b/.github/workflows/pull-request-examples.yml index ec7403c2ef3..24958642145 100644 --- a/.github/workflows/pull-request-examples.yml +++ b/.github/workflows/pull-request-examples.yml @@ -24,11 +24,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-feature-gate.yml b/.github/workflows/pull-request-feature-gate.yml index 003680e1106..8ee4a04f9e1 100644 --- a/.github/workflows/pull-request-feature-gate.yml +++ b/.github/workflows/pull-request-feature-gate.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-feature-proposal.yml b/.github/workflows/pull-request-feature-proposal.yml index a465d39ae83..438bc96b0fe 100644 --- a/.github/workflows/pull-request-feature-proposal.yml +++ b/.github/workflows/pull-request-feature-proposal.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-governance.yml b/.github/workflows/pull-request-governance.yml index a137fc3f731..709c3aba91c 100644 --- a/.github/workflows/pull-request-governance.yml +++ b/.github/workflows/pull-request-governance.yml @@ -36,11 +36,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-instruction-padding.yml b/.github/workflows/pull-request-instruction-padding.yml index 26de8896bdc..0e20f66c7bf 100644 --- a/.github/workflows/pull-request-instruction-padding.yml +++ b/.github/workflows/pull-request-instruction-padding.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-libraries.yml b/.github/workflows/pull-request-libraries.yml index cdc52217161..d6758f858d5 100644 --- a/.github/workflows/pull-request-libraries.yml +++ b/.github/workflows/pull-request-libraries.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-memo.yml b/.github/workflows/pull-request-memo.yml index 49d5700c177..2c49cd6dc0f 100644 --- a/.github/workflows/pull-request-memo.yml +++ b/.github/workflows/pull-request-memo.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-name-service.yml b/.github/workflows/pull-request-name-service.yml index 34f779db616..4880f934933 100644 --- a/.github/workflows/pull-request-name-service.yml +++ b/.github/workflows/pull-request-name-service.yml @@ -26,11 +26,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-record.yml b/.github/workflows/pull-request-record.yml index 47336d4be28..b8cd078fdeb 100644 --- a/.github/workflows/pull-request-record.yml +++ b/.github/workflows/pull-request-record.yml @@ -24,11 +24,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-shared-memory.yml b/.github/workflows/pull-request-shared-memory.yml index 9d3408b041b..5bedc3ea52f 100644 --- a/.github/workflows/pull-request-shared-memory.yml +++ b/.github/workflows/pull-request-shared-memory.yml @@ -24,11 +24,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-single-pool.yml b/.github/workflows/pull-request-single-pool.yml index 2dc5798e4d2..424bcfb9289 100644 --- a/.github/workflows/pull-request-single-pool.yml +++ b/.github/workflows/pull-request-single-pool.yml @@ -32,11 +32,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -84,11 +82,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-stake-pool.yml b/.github/workflows/pull-request-stake-pool.yml index acb7d2bb30a..b6cd624fc19 100644 --- a/.github/workflows/pull-request-stake-pool.yml +++ b/.github/workflows/pull-request-stake-pool.yml @@ -41,11 +41,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-collection.yml b/.github/workflows/pull-request-token-collection.yml index 14ab6599dfd..9f10bc8c150 100644 --- a/.github/workflows/pull-request-token-collection.yml +++ b/.github/workflows/pull-request-token-collection.yml @@ -32,11 +32,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-group.yml b/.github/workflows/pull-request-token-group.yml index 5c7c60abb6e..990b93050de 100644 --- a/.github/workflows/pull-request-token-group.yml +++ b/.github/workflows/pull-request-token-group.yml @@ -28,11 +28,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-lending.yml b/.github/workflows/pull-request-token-lending.yml index 40861bcd715..b2fe6a32563 100644 --- a/.github/workflows/pull-request-token-lending.yml +++ b/.github/workflows/pull-request-token-lending.yml @@ -28,11 +28,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-metadata.yml b/.github/workflows/pull-request-token-metadata.yml index f1a0382609a..d3937329b07 100644 --- a/.github/workflows/pull-request-token-metadata.yml +++ b/.github/workflows/pull-request-token-metadata.yml @@ -30,11 +30,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-swap.yml b/.github/workflows/pull-request-token-swap.yml index 3b375ac02f3..df1a2d63d66 100644 --- a/.github/workflows/pull-request-token-swap.yml +++ b/.github/workflows/pull-request-token-swap.yml @@ -30,11 +30,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -116,11 +114,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token-upgrade.yml b/.github/workflows/pull-request-token-upgrade.yml index e4c81960789..3af9ca8274d 100644 --- a/.github/workflows/pull-request-token-upgrade.yml +++ b/.github/workflows/pull-request-token-upgrade.yml @@ -28,11 +28,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -73,11 +71,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request-token.yml b/.github/workflows/pull-request-token.yml index 53eda7d66ce..ae212b9fda7 100644 --- a/.github/workflows/pull-request-token.yml +++ b/.github/workflows/pull-request-token.yml @@ -33,11 +33,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -85,11 +83,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -117,11 +113,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -169,11 +163,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -225,11 +217,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE_VERSION }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -284,11 +274,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: @@ -326,11 +314,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index aa89c25c622..135ed758813 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -30,11 +30,9 @@ jobs: source ci/rust-version.sh echo "RUST_NIGHTLY=$rust_nightly" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_NIGHTLY }} - override: true - profile: minimal components: rustfmt - name: Run fmt @@ -53,11 +51,9 @@ jobs: source ci/rust-version.sh echo "RUST_NIGHTLY=$rust_nightly" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_NIGHTLY }} - override: true - profile: minimal components: clippy - uses: actions/cache@v3 @@ -89,11 +85,9 @@ jobs: source ci/rust-version.sh echo "RUST_STABLE=$rust_stable" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - name: Install Cargo Audit uses: actions-rs/install@v0.1 @@ -119,11 +113,9 @@ jobs: source ci/solana-version.sh echo "SOLANA_VERSION=$solana_version" >> $GITHUB_ENV - - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_STABLE }} - override: true - profile: minimal - uses: actions/cache@v3 with: From e69088f41fefbe88ca33ffb3d86a465af8d03834 Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 15 Nov 2023 13:17:15 +0100 Subject: [PATCH 5/9] Remove usage of deprecated actions-rs/cargo --- .github/workflows/pull-request.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 135ed758813..087cc93b6bd 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -36,10 +36,7 @@ jobs: components: rustfmt - name: Run fmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + run: cargo fmt --all -- --check clippy: runs-on: ubuntu-latest @@ -70,10 +67,7 @@ jobs: run: ./ci/install-build-deps.sh - name: Run clippy - uses: actions-rs/cargo@v1 - with: - command: clippy - args: -Zunstable-options --workspace --all-targets --features test-sbf -- --deny=warnings --deny=clippy::arithmetic_side_effects + run: cargo clippy -Zunstable-options --workspace --all-targets --features test-sbf -- --deny=warnings --deny=clippy::arithmetic_side_effects audit: runs-on: ubuntu-latest From 7b5500d7656589b4ab9d295d0386800d58b58a8e Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 15 Nov 2023 13:40:40 +0100 Subject: [PATCH 6/9] Update setup-node to v4 and download-artifact to v3 --- .github/workflows/pull-request-account-compression.yml | 4 ++-- .github/workflows/pull-request-docs.yml | 2 +- .github/workflows/pull-request-js.yml | 2 +- .github/workflows/pull-request-libraries.yml | 2 +- .github/workflows/pull-request-memo.yml | 2 +- .github/workflows/pull-request-name-service.yml | 2 +- .github/workflows/pull-request-single-pool.yml | 2 +- .github/workflows/pull-request-stake-pool.yml | 4 ++-- .github/workflows/pull-request-token-lending.yml | 2 +- .github/workflows/pull-request-token-metadata.yml | 2 +- .github/workflows/pull-request-token-swap.yml | 2 +- .github/workflows/pull-request-token.yml | 4 ++-- .github/workflows/spl_action.yml | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pull-request-account-compression.yml b/.github/workflows/pull-request-account-compression.yml index 90c4fd5cf41..5643c0e18b9 100644 --- a/.github/workflows/pull-request-account-compression.yml +++ b/.github/workflows/pull-request-account-compression.yml @@ -78,7 +78,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v1 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: actions/cache@v3 @@ -88,7 +88,7 @@ jobs: restore-keys: | node- - name: Download programs - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: account-compression-programs path: account-compression/target/deploy diff --git a/.github/workflows/pull-request-docs.yml b/.github/workflows/pull-request-docs.yml index ca39ed82f10..6595a8f5b82 100644 --- a/.github/workflows/pull-request-docs.yml +++ b/.github/workflows/pull-request-docs.yml @@ -50,7 +50,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: '18' - name: "Build Docs" diff --git a/.github/workflows/pull-request-js.yml b/.github/workflows/pull-request-js.yml index 7927f53a884..67249106d35 100644 --- a/.github/workflows/pull-request-js.yml +++ b/.github/workflows/pull-request-js.yml @@ -39,7 +39,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: pnpm/action-setup@v2 diff --git a/.github/workflows/pull-request-libraries.yml b/.github/workflows/pull-request-libraries.yml index d6758f858d5..4093d330b64 100644 --- a/.github/workflows/pull-request-libraries.yml +++ b/.github/workflows/pull-request-libraries.yml @@ -64,7 +64,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: pnpm/action-setup@v2 diff --git a/.github/workflows/pull-request-memo.yml b/.github/workflows/pull-request-memo.yml index 2c49cd6dc0f..e03bda82103 100644 --- a/.github/workflows/pull-request-memo.yml +++ b/.github/workflows/pull-request-memo.yml @@ -64,7 +64,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: pnpm/action-setup@v2 diff --git a/.github/workflows/pull-request-name-service.yml b/.github/workflows/pull-request-name-service.yml index 4880f934933..2ca423c7d65 100644 --- a/.github/workflows/pull-request-name-service.yml +++ b/.github/workflows/pull-request-name-service.yml @@ -71,7 +71,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: pnpm/action-setup@v2 diff --git a/.github/workflows/pull-request-single-pool.yml b/.github/workflows/pull-request-single-pool.yml index 424bcfb9289..6b2827b71fb 100644 --- a/.github/workflows/pull-request-single-pool.yml +++ b/.github/workflows/pull-request-single-pool.yml @@ -120,7 +120,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: pnpm/action-setup@v2 diff --git a/.github/workflows/pull-request-stake-pool.yml b/.github/workflows/pull-request-stake-pool.yml index b6cd624fc19..7802eacdd21 100644 --- a/.github/workflows/pull-request-stake-pool.yml +++ b/.github/workflows/pull-request-stake-pool.yml @@ -86,7 +86,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: pnpm/action-setup@v2 @@ -117,7 +117,7 @@ jobs: key: pip-stake-pool-${{ hashFiles('stake-pool/py/requirements.txt') }} - name: Download programs - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: stake-pool-programs path: target/deploy diff --git a/.github/workflows/pull-request-token-lending.yml b/.github/workflows/pull-request-token-lending.yml index b2fe6a32563..5a317465d15 100644 --- a/.github/workflows/pull-request-token-lending.yml +++ b/.github/workflows/pull-request-token-lending.yml @@ -73,7 +73,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: pnpm/action-setup@v2 diff --git a/.github/workflows/pull-request-token-metadata.yml b/.github/workflows/pull-request-token-metadata.yml index d3937329b07..6daf2073b99 100644 --- a/.github/workflows/pull-request-token-metadata.yml +++ b/.github/workflows/pull-request-token-metadata.yml @@ -75,7 +75,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: pnpm/action-setup@v2 diff --git a/.github/workflows/pull-request-token-swap.yml b/.github/workflows/pull-request-token-swap.yml index df1a2d63d66..264b88fd128 100644 --- a/.github/workflows/pull-request-token-swap.yml +++ b/.github/workflows/pull-request-token-swap.yml @@ -88,7 +88,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: pnpm/action-setup@v2 diff --git a/.github/workflows/pull-request-token.yml b/.github/workflows/pull-request-token.yml index ae212b9fda7..c8544791f80 100644 --- a/.github/workflows/pull-request-token.yml +++ b/.github/workflows/pull-request-token.yml @@ -248,7 +248,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ env.NODE_VERSION }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ env.NODE_VERSION }} - uses: pnpm/action-setup@v2 @@ -337,7 +337,7 @@ jobs: echo "$HOME/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH - name: Download spl-transfer-hook-example program - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v3 with: name: spl-transfer-hook-example path: target/deploy diff --git a/.github/workflows/spl_action.yml b/.github/workflows/spl_action.yml index c1d6c51a03a..9cb2f7464d0 100644 --- a/.github/workflows/spl_action.yml +++ b/.github/workflows/spl_action.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 name: "importing all the document" - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: '16' name: "installing the node.js with version 16" From 12259b5c717ddc09193d2a19fc0e20fc0a9254fa Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 15 Nov 2023 13:45:49 +0100 Subject: [PATCH 7/9] Use cargo install directly instead of action --- .github/workflows/pull-request.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 087cc93b6bd..a25ad8df500 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -84,10 +84,7 @@ jobs: toolchain: ${{ env.RUST_STABLE }} - name: Install Cargo Audit - uses: actions-rs/install@v0.1 - with: - crate: cargo-audit - version: 0.17.6 + run: cargo install cargo-audit --version 0.17.6 - name: Run Cargo Audit run: ./ci/do-audit.sh From 54e5f3ecc2c86db04b86cd0aedf72f528ef53f7d Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 15 Nov 2023 13:47:40 +0100 Subject: [PATCH 8/9] Use cargo-nightly for fmt and clippy --- .github/workflows/pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index a25ad8df500..398f9502b2d 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -36,7 +36,7 @@ jobs: components: rustfmt - name: Run fmt - run: cargo fmt --all -- --check + run: ./cargo-nightly fmt --all -- --check clippy: runs-on: ubuntu-latest @@ -67,7 +67,7 @@ jobs: run: ./ci/install-build-deps.sh - name: Run clippy - run: cargo clippy -Zunstable-options --workspace --all-targets --features test-sbf -- --deny=warnings --deny=clippy::arithmetic_side_effects + run: ./cargo-nightly clippy -Zunstable-options --workspace --all-targets --features test-sbf -- --deny=warnings --deny=clippy::arithmetic_side_effects audit: runs-on: ubuntu-latest From 001bc6fc4e9604318a36714dc998985105edaa3d Mon Sep 17 00:00:00 2001 From: Jon C Date: Wed, 15 Nov 2023 13:49:18 +0100 Subject: [PATCH 9/9] Get the name of the cargo-nightly.sh script right --- .github/workflows/pull-request.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 398f9502b2d..4326d8e135f 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -36,7 +36,7 @@ jobs: components: rustfmt - name: Run fmt - run: ./cargo-nightly fmt --all -- --check + run: ./cargo-nightly.sh fmt --all -- --check clippy: runs-on: ubuntu-latest @@ -67,7 +67,7 @@ jobs: run: ./ci/install-build-deps.sh - name: Run clippy - run: ./cargo-nightly clippy -Zunstable-options --workspace --all-targets --features test-sbf -- --deny=warnings --deny=clippy::arithmetic_side_effects + run: ./cargo-nightly.sh clippy -Zunstable-options --workspace --all-targets --features test-sbf -- --deny=warnings --deny=clippy::arithmetic_side_effects audit: runs-on: ubuntu-latest