Skip to content

Commit

Permalink
CI: Update GitHub actions to modern versions (#5844)
Browse files Browse the repository at this point in the history
* Update checkout to v4

* Update cache action to v3

* Update upload-artifact to v3

* Update to dtolnay/rust-toolchain

* Remove usage of deprecated actions-rs/cargo

* Update setup-node to v4 and download-artifact to v3

* Use cargo install directly instead of action

* Use cargo-nightly for fmt and clippy

* Get the name of the cargo-nightly.sh script right
  • Loading branch information
joncinque authored Nov 15, 2023
1 parent 7333a93 commit 82713ca
Show file tree
Hide file tree
Showing 26 changed files with 214 additions and 293 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/fuzz-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -21,28 +21,26 @@ 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@v2
- uses: actions/cache@v3
with:
path: |
~/.cargo/registry
~/.cargo/git
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 }}
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/pull-request-account-compression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -32,26 +32,24 @@ 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@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 }}
Expand All @@ -66,7 +64,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"
Expand All @@ -78,19 +76,19 @@ 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
uses: actions/setup-node@v4
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') }}
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
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/pull-request-binary-oracle-pair.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -26,26 +26,24 @@ 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@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 }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull-request-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -49,8 +49,8 @@ jobs:
build_docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '18'
- name: "Build Docs"
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/pull-request-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -24,26 +24,24 @@ 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@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 }}
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/pull-request-feature-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -26,26 +26,24 @@ 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@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 }}
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/pull-request-feature-proposal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -26,26 +26,24 @@ 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@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 }}
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/pull-request-governance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -36,26 +36,24 @@ 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@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 }}
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/pull-request-instruction-padding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -26,26 +26,24 @@ 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@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 }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pull-request-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ 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
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
- 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') }}
Expand Down
Loading

0 comments on commit 82713ca

Please sign in to comment.