From deb1b5c664f0a475434daba345acb8cca5366acb Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:28 -0700 Subject: [PATCH 01/39] chore: update actions/cache to v4.0.2 --- .github/actions/setup-go/action.yml | 4 ++-- .github/workflows/rust.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/setup-go/action.yml b/.github/actions/setup-go/action.yml index eba015210..21e66e979 100644 --- a/.github/actions/setup-go/action.yml +++ b/.github/actions/setup-go/action.yml @@ -40,7 +40,7 @@ runs: shell: bash run: echo "path=./${{ inputs.go-module-file }}" >> $GITHUB_OUTPUT - - uses: actions/cache@v3 + - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 name: Cache Go Modules with: path: | @@ -51,7 +51,7 @@ runs: restore-keys: | ${{ runner.os }}-gomod-${{ inputs.cache-version }}- - - uses: actions/cache@v3 + - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 if: ${{ inputs.only-modules == 'false' }} name: Cache Go Build Outputs with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7eec6563a..36637e230 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -35,19 +35,19 @@ jobs: steps: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - name: Cache cargo registry - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.cargo/registry key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo index - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.cargo/git key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo target dir - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: contracts/target key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} @@ -78,19 +78,19 @@ jobs: steps: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - name: Cache cargo registry - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.cargo/registry key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo index - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.cargo/git key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo target dir - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: contracts/target key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} From 763b0f5c54771efeccb7f12ff3bb1eb7977e6744 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:31 -0700 Subject: [PATCH 02/39] chore: update actions/checkout to v4.1.4 --- .../actions/build_contract_artifacts/action.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/contract-release.yml | 4 ++-- .github/workflows/e2e_custom_cl.yml | 8 ++++---- .github/workflows/e2e_testnet_daily.yml | 14 +++++++------- .github/workflows/gauntlet.yml | 10 +++++----- .github/workflows/golangci-lint.yml | 4 ++-- .github/workflows/integration-tests-publish.yml | 6 +++--- .github/workflows/lint-gh-workflows.yml | 2 +- .github/workflows/monitoring.yml | 2 +- .github/workflows/open-pr.yml | 2 +- .github/workflows/relay.yml | 2 +- .github/workflows/rust.yml | 6 +++--- .github/workflows/soak.yml | 6 +++--- .github/workflows/sonar-scan.yml | 6 +++--- .github/workflows/upstream-tracker.yml | 2 +- 16 files changed, 39 insertions(+), 39 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index ebc3d2298..0934e557d 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -17,7 +17,7 @@ runs: apt update apt install git -y git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: repository: smartcontractkit/chainlink-solana ref: ${{ inputs.ref }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4962203f2..401b2e784 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up Go uses: actions/setup-go@v3 diff --git a/.github/workflows/contract-release.yml b/.github/workflows/contract-release.yml index d9bad76ac..a53e2f7f0 100644 --- a/.github/workflows/contract-release.yml +++ b/.github/workflows/contract-release.yml @@ -16,7 +16,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -29,7 +29,7 @@ jobs: env: RUSTUP_HOME: "/root/.rustup" steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build Artifacts run: anchor build - name: Generate archive diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index 93237edc8..a3930a4c0 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup go uses: actions/setup-go@v3 with: @@ -42,7 +42,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -62,7 +62,7 @@ jobs: FORCE_COLOR: 1 steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build contracts uses: ./.github/actions/build_contract_artifacts @@ -144,7 +144,7 @@ jobs: echo "CUSTOM_CORE_REF=${core_ref}" >> "${GITHUB_ENV}" fi - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Download Artifacts uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml index ac49bc32e..4fc7ba32c 100644 --- a/.github/workflows/e2e_testnet_daily.yml +++ b/.github/workflows/e2e_testnet_daily.yml @@ -48,7 +48,7 @@ jobs: this-job-name: Check Paths That Require Tests To Run continue-on-error: true - name: Checkout the repo - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 id: changes with: @@ -70,7 +70,7 @@ jobs: sha: ${{ github.sha }} steps: - name: Checkout the repo - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }} - name: Setup Go @@ -84,7 +84,7 @@ jobs: echo "short sha is: ${short_sha}" echo "short_sha=${short_sha}" >> "$GITHUB_OUTPUT" - name: Checkout solana - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: repository: smartcontractkit/chainlink-solana ref: develop @@ -100,7 +100,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the solana repo - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: repository: smartcontractkit/chainlink-solana ref: ${{ needs.get_solana_sha.outputs.sha }} @@ -159,7 +159,7 @@ jobs: - name: Checkout the solana repo # Use v3.6.0 because the custom runner (container configured above) # doesn't have node20 installed which is required for versions >=4 - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: repository: smartcontractkit/chainlink-solana ref: ${{ needs.get_solana_sha.outputs.sha }} @@ -215,7 +215,7 @@ jobs: this-job-name: Build Test Image continue-on-error: true - name: Checkout the repo - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }} - name: Build Test Image @@ -268,7 +268,7 @@ jobs: this-job-name: E2E Run Daily Smoke Tests continue-on-error: true - name: Checkout the repo - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Run Tests uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@ad22fbd6f4d108b82aaf49b527bcf40f32babea8 # v2.2.1 with: diff --git a/.github/workflows/gauntlet.yml b/.github/workflows/gauntlet.yml index dc8e73db8..4a2fb820d 100644 --- a/.github/workflows/gauntlet.yml +++ b/.github/workflows/gauntlet.yml @@ -13,7 +13,7 @@ jobs: outputs: nodejs_version: ${{ steps.tool-versions.outputs.nodejs_version }} steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: smartcontractkit/tool-versions-to-env-action@v1.0.8 id: tool-versions @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest needs: [tool_versions] steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} uses: actions/setup-node@v2 with: @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest needs: [tool_versions] steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} uses: actions/setup-node@v2 with: @@ -55,7 +55,7 @@ jobs: CI: true runs-on: ubuntu-latest steps: - - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Install Nix uses: cachix/install-nix-action@29bd9290ef037a3ecbdafe83cbd2185e9dd0fa0a # v20 with: @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-latest needs: [tool_versions] steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} uses: actions/setup-node@v2 with: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 5cf0999f1..b585853b6 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Install Nix uses: cachix/install-nix-action@29bd9290ef037a3ecbdafe83cbd2185e9dd0fa0a # v20 with: @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Install Nix uses: cachix/install-nix-action@29bd9290ef037a3ecbdafe83cbd2185e9dd0fa0a # v20 with: diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml index 5f8407cc4..e1b3d8876 100644 --- a/.github/workflows/integration-tests-publish.yml +++ b/.github/workflows/integration-tests-publish.yml @@ -20,7 +20,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -40,7 +40,7 @@ jobs: FORCE_COLOR: 1 steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build contracts uses: ./.github/actions/build_contract_artifacts @@ -63,7 +63,7 @@ jobs: this-job-name: Publish Integration Test Image continue-on-error: true - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: ref: ${{ github.event.pull_request.head.sha }} - name: Build Image diff --git a/.github/workflows/lint-gh-workflows.yml b/.github/workflows/lint-gh-workflows.yml index 789eef560..56135d078 100644 --- a/.github/workflows/lint-gh-workflows.yml +++ b/.github/workflows/lint-gh-workflows.yml @@ -7,6 +7,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out Code - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Run actionlint uses: reviewdog/action-actionlint@7556c222a14ff4583c0f772caeb7f65bb3816dc1 # v1.34.0 diff --git a/.github/workflows/monitoring.yml b/.github/workflows/monitoring.yml index 8e2119afb..15a1c9159 100644 --- a/.github/workflows/monitoring.yml +++ b/.github/workflows/monitoring.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup Docker Buildx uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 diff --git a/.github/workflows/open-pr.yml b/.github/workflows/open-pr.yml index 1da1285af..f1e802853 100644 --- a/.github/workflows/open-pr.yml +++ b/.github/workflows/open-pr.yml @@ -17,7 +17,7 @@ jobs: contents: write runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 # checkout branch that it is called from + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - uses: actions/setup-go@v3 with: go-version-file: "go.mod" diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml index a7f94bcbf..fa277d8b7 100644 --- a/.github/workflows/relay.yml +++ b/.github/workflows/relay.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 36637e230..3c278448c 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,7 +17,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -33,7 +33,7 @@ jobs: FORCE_COLOR: 1 steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Cache cargo registry uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: @@ -76,7 +76,7 @@ jobs: FORCE_COLOR: 1 steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Cache cargo registry uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: diff --git a/.github/workflows/soak.yml b/.github/workflows/soak.yml index b49882c4c..37c54551f 100644 --- a/.github/workflows/soak.yml +++ b/.github/workflows/soak.yml @@ -34,7 +34,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -74,7 +74,7 @@ jobs: FORCE_COLOR: 1 steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Build contracts if: needs.test-image-exists.outputs.exists == 'false' uses: ./.github/actions/build_contract_artifacts @@ -127,7 +127,7 @@ jobs: SELECTED_NETWORKS: SIMULATED steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: ref: ${{ env.REF_NAME }} - name: Build Test Image diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index fbb0f2401..e74986ba9 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -13,7 +13,7 @@ jobs: if: always() steps: - name: Checkout Repository - uses: actions/checkout@v3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }} @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out Code - uses: actions/checkout@v3 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Parse tool-versions file uses: smartcontractkit/tool-versions-to-env-action@v1.0.8 id: tool-versions @@ -48,7 +48,7 @@ jobs: if: ${{ always() }} steps: - name: Fetch blame information - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 with: fetch-depth: 0 # fetches all history for all tags and branches to provide more metadata for sonar reports diff --git a/.github/workflows/upstream-tracker.yml b/.github/workflows/upstream-tracker.yml index 9b155ed02..f5eb74a22 100644 --- a/.github/workflows/upstream-tracker.yml +++ b/.github/workflows/upstream-tracker.yml @@ -28,7 +28,7 @@ jobs: echo "closed<> $GITHUB_OUTPUT echo "$CLOSED" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - - uses: actions/checkout@v3 + - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 if: steps.updates.outputs.open || steps.updates.outputs.closed - name: Open Issue if: steps.updates.outputs.open || steps.updates.outputs.closed From ea8d1a841ba1c18a9ffd990fd63ce1f27db40f22 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:32 -0700 Subject: [PATCH 03/39] chore: update actions/download-artifact to v4.1.7 --- .github/actions/build-test-image/action.yml | 2 +- .github/workflows/e2e_custom_cl.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-test-image/action.yml b/.github/actions/build-test-image/action.yml index 84045ba8b..5cee63ccb 100644 --- a/.github/actions/build-test-image/action.yml +++ b/.github/actions/build-test-image/action.yml @@ -35,7 +35,7 @@ runs: AWS_REGION: ${{ inputs.QA_AWS_REGION }} AWS_ROLE_TO_ASSUME: ${{ inputs.QA_AWS_ROLE_TO_ASSUME }} - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: artifacts path: ${{ inputs.artifacts_path }} diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index a3930a4c0..a9dc9a609 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -146,7 +146,7 @@ jobs: - name: Checkout the repo uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: artifacts path: ${{ env.CONTRACT_ARTIFACTS_PATH }} From 3529dcb7cabac263043a27da52c61661366a3a14 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:32 -0700 Subject: [PATCH 04/39] chore: update actions/setup-go to v5.0.1 --- .github/actions/build_contract_artifacts/action.yml | 2 +- .github/actions/setup-go/action.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/e2e_custom_cl.yml | 2 +- .github/workflows/open-pr.yml | 2 +- .github/workflows/relay.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index 0934e557d..94ec59359 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -22,7 +22,7 @@ runs: repository: smartcontractkit/chainlink-solana ref: ${{ inputs.ref }} - name: Setup go - uses: actions/setup-go@v4 + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version-file: "go.mod" check-latest: true diff --git a/.github/actions/setup-go/action.yml b/.github/actions/setup-go/action.yml index 21e66e979..84c0040e0 100644 --- a/.github/actions/setup-go/action.yml +++ b/.github/actions/setup-go/action.yml @@ -18,7 +18,7 @@ runs: using: composite steps: - name: Set up Go - uses: actions/setup-go@v4 + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version-file: ${{ inputs.go-version-file }} cache: false diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 401b2e784..331848d12 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -41,7 +41,7 @@ jobs: uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Set up Go - uses: actions/setup-go@v3 + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version-file: "go.mod" check-latest: true diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index a9dc9a609..3e964bbb1 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -27,7 +27,7 @@ jobs: - name: Checkout sources uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup go - uses: actions/setup-go@v3 + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version-file: "go.mod" check-latest: true diff --git a/.github/workflows/open-pr.yml b/.github/workflows/open-pr.yml index f1e802853..f12d2a476 100644 --- a/.github/workflows/open-pr.yml +++ b/.github/workflows/open-pr.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version-file: "go.mod" check-latest: true diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml index fa277d8b7..dda5fd750 100644 --- a/.github/workflows/relay.yml +++ b/.github/workflows/relay.yml @@ -14,7 +14,7 @@ jobs: - name: Checkout sources uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup go - uses: actions/setup-go@v3 + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version-file: "go.mod" check-latest: true From e8a4702d82778015c894c19c608d7299bee6e3ed Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:33 -0700 Subject: [PATCH 05/39] chore: update actions/setup-node to v4.0.2 --- .github/workflows/gauntlet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gauntlet.yml b/.github/workflows/gauntlet.yml index 4a2fb820d..77448625b 100644 --- a/.github/workflows/gauntlet.yml +++ b/.github/workflows/gauntlet.yml @@ -24,7 +24,7 @@ jobs: steps: - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version: ${{ needs.tool_versions.outputs.nodejs_version }} - name: Install @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version: ${{ needs.tool_versions.outputs.nodejs_version }} - name: Install @@ -82,7 +82,7 @@ jobs: steps: - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} - uses: actions/setup-node@v2 + uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version: ${{ needs.tool_versions.outputs.nodejs_version }} - name: Install From c3b0d38d93bdbfc6b59a180309e627f9969cbff5 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:34 -0700 Subject: [PATCH 06/39] chore: update actions/upload-artifact to v4.3.3 --- .github/actions/build_contract_artifacts/action.yml | 2 +- .github/workflows/gauntlet.yml | 2 +- .github/workflows/golangci-lint.yml | 4 ++-- .github/workflows/relay.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index 94ec59359..c8cbf432a 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -47,7 +47,7 @@ runs: run: anchor build working-directory: contracts - name: Upload Artifacts - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: artifacts path: contracts/target/deploy diff --git a/.github/workflows/gauntlet.yml b/.github/workflows/gauntlet.yml index 77448625b..460dfc8fa 100644 --- a/.github/workflows/gauntlet.yml +++ b/.github/workflows/gauntlet.yml @@ -70,7 +70,7 @@ jobs: - run: nix develop -c yarn --cwd ./gauntlet eslint - name: Upload eslint report if: always() - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: gauntlet-eslint-report path: ./gauntlet/eslint-report.json diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index b585853b6..b2f858d31 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -18,7 +18,7 @@ jobs: run: nix develop -c make lint-go-integration-tests - name: Store lint report artifact if: always() - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: golangci-lint-integration-tests-report path: ./integration-tests/golangci-lint-integration-tests-report.xml @@ -37,7 +37,7 @@ jobs: run: nix develop -c make lint-go-relay - name: Store lint report artifact if: always() - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: golangci-lint-relay-report path: ./pkg/golangci-lint-relay-report.xml \ No newline at end of file diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml index dda5fd750..465e8fc56 100644 --- a/.github/workflows/relay.yml +++ b/.github/workflows/relay.yml @@ -35,7 +35,7 @@ jobs: run: go test ./pkg/... -v -race -count=10 -timeout=15m -covermode=atomic -coverpkg=./... -coverprofile=race_coverage.txt - name: Upload Go test results if: always() - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: go-relay-test-results path: | From 37db19c13d99d4072ced53e5fdeb61afb95e8144 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:34 -0700 Subject: [PATCH 07/39] chore: update cachix/cachix-action to v14 --- .github/workflows/gauntlet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gauntlet.yml b/.github/workflows/gauntlet.yml index 460dfc8fa..5508ff31c 100644 --- a/.github/workflows/gauntlet.yml +++ b/.github/workflows/gauntlet.yml @@ -62,7 +62,7 @@ jobs: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: "sandbox = false" - name: Cache Nix - uses: cachix/cachix-action@v12 + uses: cachix/cachix-action@18cf96c7c98e048e10a83abd92116114cd8504be # v14 with: name: chainlink-cosmos authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' From a4e53b6793f73c35a1dd0aa874b40dc4d8ff45f8 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:35 -0700 Subject: [PATCH 08/39] chore: update cachix/install-nix-action to v26 --- .github/workflows/gauntlet.yml | 2 +- .github/workflows/golangci-lint.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gauntlet.yml b/.github/workflows/gauntlet.yml index 5508ff31c..a8d4f2f59 100644 --- a/.github/workflows/gauntlet.yml +++ b/.github/workflows/gauntlet.yml @@ -57,7 +57,7 @@ jobs: steps: - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Install Nix - uses: cachix/install-nix-action@29bd9290ef037a3ecbdafe83cbd2185e9dd0fa0a # v20 + uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: nix_path: nixpkgs=channel:nixos-unstable extra_nix_config: "sandbox = false" diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index b2f858d31..8f5cef3c5 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -11,7 +11,7 @@ jobs: - name: Checkout sources uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Install Nix - uses: cachix/install-nix-action@29bd9290ef037a3ecbdafe83cbd2185e9dd0fa0a # v20 + uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: nix_path: nixpkgs=channel:nixos-unstable - name: golangci-lint @@ -30,7 +30,7 @@ jobs: - name: Checkout sources uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Install Nix - uses: cachix/install-nix-action@29bd9290ef037a3ecbdafe83cbd2185e9dd0fa0a # v20 + uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: nix_path: nixpkgs=channel:nixos-unstable - name: golangci-lint From 2d06ba7cb69108b54283cebcf6c02fe39ba52d15 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:35 -0700 Subject: [PATCH 09/39] chore: update dawidd6/action-download-artifact to v3.1.4 --- .github/workflows/sonar-scan.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index e74986ba9..22a58161f 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -53,7 +53,7 @@ jobs: fetch-depth: 0 # fetches all history for all tags and branches to provide more metadata for sonar reports - name: Download Golangci integration tests reports - uses: dawidd6/action-download-artifact@v2.27.0 + uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4 with: workflow: golangci-lint.yml workflow_conclusion: "" @@ -62,7 +62,7 @@ jobs: if_no_artifact_found: warn - name: Download Golangci relay reports - uses: dawidd6/action-download-artifact@v2.27.0 + uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4 with: workflow: golangci-lint.yml workflow_conclusion: "" @@ -71,7 +71,7 @@ jobs: if_no_artifact_found: warn - name: Download Relayer unit tests report - uses: dawidd6/action-download-artifact@v2.27.0 + uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4 with: workflow: relay.yml workflow_conclusion: "" @@ -80,7 +80,7 @@ jobs: if_no_artifact_found: warn - name: Download gauntlet eslint reports - uses: dawidd6/action-download-artifact@v2.27.0 + uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe # v3.1.4 with: workflow: gauntlet.yml workflow_conclusion: "" From f27f9c7bcf089010907f02e56091b47a4a3e560f Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:36 -0700 Subject: [PATCH 10/39] chore: update dorny/paths-filter to v3.0.2 --- .github/workflows/e2e_testnet_daily.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml index 4fc7ba32c..9fca2b4e4 100644 --- a/.github/workflows/e2e_testnet_daily.yml +++ b/.github/workflows/e2e_testnet_daily.yml @@ -49,7 +49,7 @@ jobs: continue-on-error: true - name: Checkout the repo uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - - uses: dorny/paths-filter@4512585405083f25c027a35db413c2b3b9006d50 # v2.11.1 + - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 id: changes with: filters: | From 1bb1f499a4959942942b8c1c00d2cac4855b339c Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:36 -0700 Subject: [PATCH 11/39] chore: update github/codeql-action/analyze to v3.25.3 --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 331848d12..cbf0dfc7d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -69,4 +69,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@39d8d7e78f59cf6b40ac3b9fbebef0c753d7c9e5 # v2.2.2 + uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 From 60b6968e81cf9420a94e60f82741d5349e916d1f Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:37 -0700 Subject: [PATCH 12/39] chore: update github/codeql-action/autobuild to v3.25.3 --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index cbf0dfc7d..6c163f0db 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -55,7 +55,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@39d8d7e78f59cf6b40ac3b9fbebef0c753d7c9e5 # v2.2.2 + uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl From 8ad98cf958f716234a49323bb60d2d84c45fb6ff Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:37 -0700 Subject: [PATCH 13/39] chore: update github/codeql-action/init to v3.25.3 --- .github/workflows/codeql-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 6c163f0db..5cb389eef 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -48,7 +48,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@39d8d7e78f59cf6b40ac3b9fbebef0c753d7c9e5 # v2.2.2 + uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3 with: languages: ${{ matrix.language }} From a75064d47349d59eb06273ae5da03bad10802cac Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:38 -0700 Subject: [PATCH 14/39] chore: update peter-evans/create-pull-request to v6.0.5 --- .github/workflows/open-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/open-pr.yml b/.github/workflows/open-pr.yml index f12d2a476..9d2b98b0f 100644 --- a/.github/workflows/open-pr.yml +++ b/.github/workflows/open-pr.yml @@ -76,7 +76,7 @@ jobs: aws-region: ${{ secrets.AWS_REGION }} - name: Create pull request if: '!steps.check.outputs.skip' - uses: peter-evans/create-pull-request@b1ddad2c994a25fbc81a28b3ec0e368bb2021c50 # v6.0.0 + uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6.0.5 with: title: ${{ steps.run.outputs.prTitle }} base: ${{ steps.branch.outputs.original }} From f2d20917790b9ba9da02ecf92caf63d827518595 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:38 -0700 Subject: [PATCH 15/39] chore: update planetscale/ghcommit-action to v0.1.37 --- .github/workflows/open-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/open-pr.yml b/.github/workflows/open-pr.yml index 9d2b98b0f..c3a7ced6b 100644 --- a/.github/workflows/open-pr.yml +++ b/.github/workflows/open-pr.yml @@ -52,7 +52,7 @@ jobs: echo "original=$SHA" >> "$GITHUB_OUTPUT" git branch "${{ steps.run.outputs.name }}" git push origin "${{ steps.run.outputs.name }}" - - uses: planetscale/ghcommit-action@v0.1.33 + - uses: planetscale/ghcommit-action@21a8cda29f55e5cc2cdae0cdbdd08e38dd148c25 # v0.1.37 if: '!steps.check.outputs.skip' with: commit_message: ${{ steps.run.outputs.commitString }} From 655ab556cf40b5ba5f9fb1010196e609f18dba37 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:39 -0700 Subject: [PATCH 16/39] chore: update reviewdog/action-actionlint to v1.45.0 --- .github/workflows/lint-gh-workflows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-gh-workflows.yml b/.github/workflows/lint-gh-workflows.yml index 56135d078..2072dbbe5 100644 --- a/.github/workflows/lint-gh-workflows.yml +++ b/.github/workflows/lint-gh-workflows.yml @@ -9,4 +9,4 @@ jobs: - name: Check out Code uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Run actionlint - uses: reviewdog/action-actionlint@7556c222a14ff4583c0f772caeb7f65bb3816dc1 # v1.34.0 + uses: reviewdog/action-actionlint@51bfb044ddaed55059d16f14daedbe05a9937dc1 # v1.45.0 From 25e2281d16d7055c63421af557420a25b7ca71ff Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:40 -0700 Subject: [PATCH 17/39] chore: update setup-github-token to setup-github-token@0.1.2 --- .github/workflows/open-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/open-pr.yml b/.github/workflows/open-pr.yml index c3a7ced6b..e1de77de3 100644 --- a/.github/workflows/open-pr.yml +++ b/.github/workflows/open-pr.yml @@ -69,7 +69,7 @@ jobs: - name: Setup GitHub Token if: '!steps.check.outputs.skip' id: token - uses: smartcontractkit/.github/actions/setup-github-token@9e7cc0779934cae4a9028b8588c9adb64d8ce68c # setup-github-token@0.1.0 + uses: smartcontractkit/.github/actions/setup-github-token@7ac9af09dda8c553593d2153a975b43b6958fa9f # setup-github-token@0.1.2 with: aws-role-arn: ${{ secrets.AWS_OIDC_CHAINLINK_SOLANA_CICD_TOKEN_ISSUER_ROLE_ARN }} aws-lambda-url: ${{ secrets.AWS_RELENG_TEAM_GATI_LAMBDA_URL }} From 71cdd1ea1d1f56eb77c0d73c33cb85ad1bfa93e8 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:40 -0700 Subject: [PATCH 18/39] chore: update chainlink-testing-framework/* to v2.3.16 --- .github/actions/build-test-image/action.yml | 6 +++--- .github/workflows/e2e_custom_cl.yml | 6 +++--- .github/workflows/e2e_testnet_daily.yml | 8 ++++---- .github/workflows/soak.yml | 8 ++++---- .github/workflows/sonar-scan.yml | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/actions/build-test-image/action.yml b/.github/actions/build-test-image/action.yml index 5cee63ccb..ae57a5616 100644 --- a/.github/actions/build-test-image/action.yml +++ b/.github/actions/build-test-image/action.yml @@ -28,7 +28,7 @@ runs: steps: - name: Check if image exists id: check-image - uses: smartcontractkit/chainlink-github-actions/docker/image-exists@336617ae6d70fec60c15cc3382e17a4d2615a801 # v2.2.0 + uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: repository: chainlink-solana-tests tag: ${{ inputs.tag }} @@ -41,14 +41,14 @@ runs: path: ${{ inputs.artifacts_path }} - name: Get CTF Version id: version - uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/mod-version@92e0f299a87522c2a37bfc4686c4d8a96dc9d28b # v2.3.5 + uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/mod-version@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: go-project-path: ./integration-tests module-name: github.com/smartcontractkit/chainlink-testing-framework enforce-semantic-tag: false - name: Build and Publish Test Runner if: steps.check-image.outputs.exists == 'false' - uses: smartcontractkit/chainlink-github-actions/docker/build-push@336617ae6d70fec60c15cc3382e17a4d2615a801 # v2.2.0 + uses: smartcontractkit/chainlink-github-actions/docker/build-push@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: tags: | ${{ inputs.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ inputs.QA_AWS_REGION }}.amazonaws.com/chainlink-solana-tests:${{ inputs.tag }} diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index 3e964bbb1..dee138541 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -87,7 +87,7 @@ jobs: fi - name: Check if image exists id: check-image - uses: smartcontractkit/chainlink-github-actions/docker/image-exists@ad22fbd6f4d108b82aaf49b527bcf40f32babea8 # v2.2.1 + uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: repository: chainlink tag: solana.${{ env.CUSTOM_CORE_REF || github.event.inputs.cl_branch_ref || github.sha }} @@ -95,7 +95,7 @@ jobs: AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }} - name: Build Image if: steps.check-image.outputs.exists == 'false' - uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@d5ab9fe53da374dd789b5d9ef10f3282197e088d # we will want to switch to this once cosmos settles back down 336617ae6d70fec60c15cc3382e17a4d2615a801 # v2.2.0 + uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: cl_repo: smartcontractkit/chainlink cl_ref: ${{ env.CUSTOM_CORE_REF || github.event.inputs.cl_branch_ref }} @@ -167,7 +167,7 @@ jobs: # shellcheck disable=SC2086 echo "BASE64_CONFIG_OVERRIDE=$BASE64_CONFIG_OVERRIDE" >> $GITHUB_ENV - name: Run Tests - uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@eccde1970eca69f079d3efb3409938a72ade8497 # v2.2.13 + uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: test_command_to_run: cd ./integration-tests && go test -timeout 24h -count=1 -run TestSolanaOCRV2Smoke -json $(args) ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt test_download_vendor_packages_command: cd ./integration-tests && go mod download diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml index 9fca2b4e4..4f6eef79a 100644 --- a/.github/workflows/e2e_testnet_daily.yml +++ b/.github/workflows/e2e_testnet_daily.yml @@ -123,7 +123,7 @@ jobs: steps: - name: Check if image exists id: check-image - uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e865e376b8c2d594028c8d645dd6c47169b72974 # v2.2.16 + uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: repository: chainlink-solana-tests tag: ${{ needs.get_solana_sha.outputs.sha }} @@ -179,7 +179,7 @@ jobs: steps: - name: Check if image exists id: check-image - uses: smartcontractkit/chainlink-github-actions/docker/image-exists@ad22fbd6f4d108b82aaf49b527bcf40f32babea8 # v2.2.1 + uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: repository: chainlink tag: solana.${{ github.sha }} @@ -187,7 +187,7 @@ jobs: AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }} - name: Build Image if: steps.check-image.outputs.exists == 'false' - uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@d5ab9fe53da374dd789b5d9ef10f3282197e088d # we will want to switch to this once cosmos settles back down 336617ae6d70fec60c15cc3382e17a4d2615a801 # v2.2.0 + uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: cl_repo: smartcontractkit/chainlink cl_ref: ${{ github.event.inputs.cl_branch_ref }} @@ -270,7 +270,7 @@ jobs: - name: Checkout the repo uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - name: Run Tests - uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@ad22fbd6f4d108b82aaf49b527bcf40f32babea8 # v2.2.1 + uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: test_command_to_run: cd ./integration-tests && go test -timeout 24h -count=1 -run TestSolanaGauntletOCRV2Smoke -json $(args) ./smoke 2>&1 | tee /tmp/gotest.log | gotestfmt go_mod_path: ./integration-tests/go.mod diff --git a/.github/workflows/soak.yml b/.github/workflows/soak.yml index 37c54551f..a55532f98 100644 --- a/.github/workflows/soak.yml +++ b/.github/workflows/soak.yml @@ -52,7 +52,7 @@ jobs: steps: - name: Check if image exists id: check-image - uses: smartcontractkit/chainlink-github-actions/docker/image-exists@336617ae6d70fec60c15cc3382e17a4d2615a801 # v2.2.0 + uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: repository: chainlink-solana-tests tag: ${{ github.sha }} @@ -89,14 +89,14 @@ jobs: steps: - name: Check if image exists id: check-image - uses: smartcontractkit/chainlink-github-actions/docker/image-exists@336617ae6d70fec60c15cc3382e17a4d2615a801 # v2.2.0 + uses: smartcontractkit/chainlink-github-actions/docker/image-exists@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: repository: chainlink tag: solana.${{ github.sha }} AWS_REGION: ${{ secrets.QA_AWS_REGION }} AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }} - name: Build Image - uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@cosmos_one_off # we will want to switch back to this once cosmos cools off336617ae6d70fec60c15cc3382e17a4d2615a801 # v2.2.0 + uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: cl_repo: smartcontractkit/chainlink cl_ref: ${{ github.event.inputs.cl_branch_ref }} @@ -138,7 +138,7 @@ jobs: QA_AWS_REGION: ${{ secrets.QA_AWS_REGION }} QA_AWS_ACCOUNT_NUMBER: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }} - name: Run Tests - uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@336617ae6d70fec60c15cc3382e17a4d2615a801 # v2.2.0 + uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: test_command_to_run: cd ./integration-tests && go test -timeout 5h -count=1 -json $(args) ./soak 2>&1 | tee /tmp/gotest.log | gotestfmt go_mod_path: ./integration-tests/go.mod diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index 22a58161f..fbe55908a 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -19,7 +19,7 @@ jobs: - name: Wait for Workflows id: wait - uses: smartcontractkit/chainlink-github-actions/utils/wait-for-workflows@main + uses: smartcontractkit/chainlink-github-actions/utils/wait-for-workflows@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: max-timeout: "1200" polling-interval: "30" From 48dfababb4c0eb0abc5f7ded66f8815de7e01798 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:45 -0700 Subject: [PATCH 19/39] chore: update smartcontractkit/push-gha-metrics-action to v3.0.0 --- .github/workflows/e2e_custom_cl.yml | 3 ++- .github/workflows/e2e_testnet_daily.yml | 9 ++++++--- .github/workflows/integration-tests-publish.yml | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index dee138541..1ff07d3f2 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -127,8 +127,9 @@ jobs: steps: - name: Collect Metrics id: collect-gha-metrics - uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0 + uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0 with: + id: e2e_custom_run_smoke_tests org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }} diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml index 4f6eef79a..053a19654 100644 --- a/.github/workflows/e2e_testnet_daily.yml +++ b/.github/workflows/e2e_testnet_daily.yml @@ -40,8 +40,9 @@ jobs: steps: - name: Collect Metrics id: collect-gha-metrics - uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0 + uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0 with: + id: e2e_testnet_daily-changes org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }} @@ -207,8 +208,9 @@ jobs: steps: - name: Collect Metrics id: collect-gha-metrics - uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0 + uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0 with: + id: e2e_testnet_daily-build-test-image org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }} @@ -260,8 +262,9 @@ jobs: steps: - name: Collect Metrics id: collect-gha-metrics - uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0 + uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0 with: + id: e2e_custom_run_daily_testnet_smoke_tests org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }} diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml index e1b3d8876..df6475386 100644 --- a/.github/workflows/integration-tests-publish.yml +++ b/.github/workflows/integration-tests-publish.yml @@ -55,8 +55,9 @@ jobs: steps: - name: Collect Metrics id: collect-gha-metrics - uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0 + uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0 with: + id: integration-tests-publish-image org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }} From 1b2933deb3eda96bb35b3431a16af8458cbf94c4 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:46 -0700 Subject: [PATCH 20/39] chore: update softprops/action-gh-release to v2.0.5 --- .github/workflows/contract-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/contract-release.yml b/.github/workflows/contract-release.yml index a53e2f7f0..6571980a2 100644 --- a/.github/workflows/contract-release.yml +++ b/.github/workflows/contract-release.yml @@ -36,7 +36,7 @@ jobs: run: | tar cfvz artifacts.tar.gz target/deploy/*.so target/idl/* - name: Create Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 # v2.0.5 with: files: | contracts/artifacts.tar.gz From b60a466117c8f40f85de841fd3c70f5c238390a7 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:46 -0700 Subject: [PATCH 21/39] chore: update sonarsource/sonarqube-scan-action to v2.0.2 --- .github/workflows/sonar-scan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index fbe55908a..18847e541 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -105,7 +105,7 @@ jobs: - name: SonarQube Scan - uses: sonarsource/sonarqube-scan-action@69c1a75940dec6249b86dace6b630d3a2ae9d2a7 # v2.0.1 + uses: sonarsource/sonarqube-scan-action@53c3e3207fe4b8d52e2f1ac9d6eb1d2506f626c0 # v2.0.2 with: args: > -Dsonar.go.tests.reportPaths=${{ steps.sonarqube_report_paths.outputs.sonarqube_tests_report_paths }} From 33959442e12318f8f17fb17c649cc7ee3be17fa8 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:12:46 -0700 Subject: [PATCH 22/39] chore: update tj-actions/branch-names to v8.0.1 --- .github/actions/setup-go/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-go/action.yml b/.github/actions/setup-go/action.yml index 84c0040e0..77aae5b44 100644 --- a/.github/actions/setup-go/action.yml +++ b/.github/actions/setup-go/action.yml @@ -26,7 +26,7 @@ runs: - name: Get branch name if: ${{ inputs.only-modules == 'false' }} id: branch-name - uses: tj-actions/branch-names@2e5354c6733793113f416314375826df030ada23 #v6.5 + uses: tj-actions/branch-names@6871f53176ad61624f978536bbf089c574dc19a2 # v8.0.1 - name: Set go cache keys shell: bash From cd7ea1a8417e2bc27055e1532d9fa61c70ec327a Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:19:01 -0700 Subject: [PATCH 23/39] chore: fix contracts build w/ outdated container --- .../build_contract_artifacts/action.yml | 6 +- .github/workflows/e2e_custom_cl.yml | 8 +- .github/workflows/e2e_testnet_daily.yml | 2 +- .github/workflows/rust.yml | 73 +++++++++---------- 4 files changed, 46 insertions(+), 43 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index c8cbf432a..ebc3d2298 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -17,12 +17,12 @@ runs: apt update apt install git -y git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 with: repository: smartcontractkit/chainlink-solana ref: ${{ inputs.ref }} - name: Setup go - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 + uses: actions/setup-go@v4 with: go-version-file: "go.mod" check-latest: true @@ -47,7 +47,7 @@ runs: run: anchor build working-directory: contracts - name: Upload Artifacts - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: name: artifacts path: contracts/target/deploy diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index 1ff07d3f2..9d5225ea3 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -62,7 +62,9 @@ jobs: FORCE_COLOR: 1 steps: - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + # Use v3.6.0 because the custom runner (container configured above) + # doesn't have node20 installed which is required for versions >=4 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Build contracts uses: ./.github/actions/build_contract_artifacts @@ -146,8 +148,10 @@ jobs: fi - name: Checkout the repo uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + # Use v3-node20 because the build_contract_artfifacts action must use the node16 actions/upload-artifact@v3 + # due to tech-debt. actions/download-artifact@v4 is not compatible with actions/upload-artifact@v3. - name: Download Artifacts - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + uses: actions/download-artifact@246d7188e736d3686f6d19628d253ede9697bd55 # v3-node20 with: name: artifacts path: ${{ env.CONTRACT_ARTIFACTS_PATH }} diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml index 053a19654..57b766df5 100644 --- a/.github/workflows/e2e_testnet_daily.yml +++ b/.github/workflows/e2e_testnet_daily.yml @@ -160,7 +160,7 @@ jobs: - name: Checkout the solana repo # Use v3.6.0 because the custom runner (container configured above) # doesn't have node20 installed which is required for versions >=4 - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 with: repository: smartcontractkit/chainlink-solana ref: ${{ needs.get_solana_sha.outputs.sha }} diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 3c278448c..5300a705f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -31,40 +31,39 @@ jobs: env: RUSTUP_HOME: "/root/.rustup" FORCE_COLOR: 1 - steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 - - name: Cache cargo registry - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 - with: - path: ~/.cargo/registry - key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }} - - - name: Cache cargo index - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 - with: - path: ~/.cargo/git - key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }} - - - name: Cache cargo target dir - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 - with: - path: contracts/target - key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} - - - run: solana-keygen new -o id.json --no-bip39-passphrase - - name: Compile typescript client - run: | - cd ../ts - yarn install --frozen-lockfile - yarn build - - run: yarn install --frozen-lockfile - - run: anchor test - - run: | - cd examples/hello-world - yarn install --frozen-lockfile - anchor test - + - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - name: Cache cargo registry + uses: actions/cache@v2.1.7 + with: + path: ~/.cargo/registry + key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }} + + - name: Cache cargo index + uses: actions/cache@v2.1.7 + with: + path: ~/.cargo/git + key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }} + + - name: Cache cargo target dir + uses: actions/cache@v2.1.7 + with: + path: contracts/target + key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} + + - run: solana-keygen new -o id.json --no-bip39-passphrase + - name: Compile typescript client + run: | + cd ../ts + yarn install --frozen-lockfile + yarn build + - run: yarn install --frozen-lockfile + - run: anchor test + - run: | + cd examples/hello-world + yarn install --frozen-lockfile + anchor test + rust_lint: name: Rust Lint runs-on: ubuntu-latest @@ -76,21 +75,21 @@ jobs: FORCE_COLOR: 1 steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - name: Cache cargo registry - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + uses: actions/cache@v2.1.7 with: path: ~/.cargo/registry key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo index - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + uses: actions/cache@v2.1.7 with: path: ~/.cargo/git key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo target dir - uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 + uses: actions/cache@v2.1.7 with: path: contracts/target key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} From 6b7ea6f86ecdd3c810d4c54ff30c9da633bb2fe0 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 7 May 2024 16:51:40 -0700 Subject: [PATCH 24/39] fix: use should_checkout for build-images --- .github/workflows/e2e_custom_cl.yml | 1 + .github/workflows/e2e_testnet_daily.yml | 1 + .github/workflows/soak.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index 9d5225ea3..333c4ca03 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -99,6 +99,7 @@ jobs: if: steps.check-image.outputs.exists == 'false' uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: + should_checkout: true cl_repo: smartcontractkit/chainlink cl_ref: ${{ env.CUSTOM_CORE_REF || github.event.inputs.cl_branch_ref }} dep_solana_sha: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml index 57b766df5..ecb052bf6 100644 --- a/.github/workflows/e2e_testnet_daily.yml +++ b/.github/workflows/e2e_testnet_daily.yml @@ -190,6 +190,7 @@ jobs: if: steps.check-image.outputs.exists == 'false' uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: + should_checkout: true cl_repo: smartcontractkit/chainlink cl_ref: ${{ github.event.inputs.cl_branch_ref }} dep_solana_sha: ${{ github.event.pull_request.head.sha }} diff --git a/.github/workflows/soak.yml b/.github/workflows/soak.yml index a55532f98..0265ce369 100644 --- a/.github/workflows/soak.yml +++ b/.github/workflows/soak.yml @@ -98,6 +98,7 @@ jobs: - name: Build Image uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/build-image@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: + should_checkout: true cl_repo: smartcontractkit/chainlink cl_ref: ${{ github.event.inputs.cl_branch_ref }} dep_solana_sha: ${{ github.sha }} From 34e5fdf3cd289cf8bd83c72eb6ae4612aeef32cb Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 11:25:08 -0600 Subject: [PATCH 25/39] Use a docker run command to build contracts This temporarily gets around node issues for building contracts --- .../build_contract_artifacts/action.yml | 27 ++++++-- .github/workflows/e2e_custom_cl.yml | 13 ++-- .github/workflows/e2e_testnet_daily.yml | 12 ++-- .../workflows/integration-tests-publish.yml | 13 ++-- .github/workflows/soak.yml | 13 ++-- scripts/build-contract-artifacts-action.sh | 65 +++++++++++++++++++ 6 files changed, 119 insertions(+), 24 deletions(-) create mode 100755 scripts/build-contract-artifacts-action.sh diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index ebc3d2298..fa308f9cd 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -4,11 +4,24 @@ inputs: ref: required: false description: The chainlink-solana ref to use + image: + required: false + description: docker image to use to build + image-version: + required: false + description: docker image version/tag to use for build runs: using: composite steps: + - name: Docker run + if: ${{ inputs.image != "" && inputs.image-version != "" }} + shell: bash + run: docker run -v $(pwd):/repo projectserum/build:v0.27.0 bash -c "/repo/scripts/build-contract-artifacts-action.sh" + + # should be used again after moving from projectserum/build to backpackapp/build - name: Install latest Git version (>= 2.18.0) for actions/checkout + if: ${{ inputs.image == "" && inputs.image-version == "" }} shell: bash run: | apt-get update @@ -17,35 +30,41 @@ runs: apt update apt install git -y git config --global --add safe.directory "$GITHUB_WORKSPACE" - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - name: Checkout solana + if: ${{ inputs.image == "" && inputs.image-version == "" }} + uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 with: repository: smartcontractkit/chainlink-solana ref: ${{ inputs.ref }} - name: Setup go + if: ${{ inputs.image == "" && inputs.image-version == "" }} uses: actions/setup-go@v4 with: go-version-file: "go.mod" check-latest: true - - name: yarn install - shell: bash - run: yarn install --frozen-lockfile - name: Generate build artifacts for go bindings check + if: ${{ inputs.image == "" && inputs.image-version == "" }} shell: bash run: anchor build working-directory: contracts - name: Check generated go bindings are up to date + if: ${{ inputs.image == "" && inputs.image-version == "" }} shell: bash run: | go install github.com/gagliardetto/anchor-go@v0.2.3 ./scripts/anchor-go-gen.sh git diff --stat --exit-code - name: Generate program_ids + if: ${{ inputs.image == "" && inputs.image-version == "" }} shell: bash run: ./scripts/programs-keys-gen.sh - name: Generate build artifacts with custom program_ids + if: ${{ inputs.image == "" && inputs.image-version == "" }} shell: bash run: anchor build working-directory: contracts + + #save the contracts artifacts - name: Upload Artifacts uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 with: diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index 93237edc8..660090d77 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -55,16 +55,19 @@ jobs: contents: read runs-on: ubuntu-latest-32cores-128GB needs: [get_projectserum_version] - container: - image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} - env: - RUSTUP_HOME: "/root/.rustup" - FORCE_COLOR: 1 + # container: + # image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} + # env: + # RUSTUP_HOME: "/root/.rustup" + # FORCE_COLOR: 1 steps: - name: Checkout the repo uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - name: Build contracts uses: ./.github/actions/build_contract_artifacts + with: + image: projectserum/build + image-version: ${{ needs.get_projectserum_version.outputs.projectserum_version }} e2e_custom_build_custom_chainlink_image: name: E2E Custom Build Custom CL Image diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml index ac49bc32e..ce34feca8 100644 --- a/.github/workflows/e2e_testnet_daily.yml +++ b/.github/workflows/e2e_testnet_daily.yml @@ -141,10 +141,10 @@ jobs: get_solana_sha, ] container: - image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} - env: - RUSTUP_HOME: "/root/.rustup" - FORCE_COLOR: 1 + # image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} + # env: + # RUSTUP_HOME: "/root/.rustup" + # FORCE_COLOR: 1 steps: - name: Collect Metrics if: needs.changes.outputs.src == 'true' @@ -165,9 +165,11 @@ jobs: ref: ${{ needs.get_solana_sha.outputs.sha }} - name: Build contracts if: needs.changes.outputs.src == 'true' && needs.solana-test-image-exists.outputs.exists == 'false' - uses: smartcontractkit/chainlink-solana/.github/actions/build_contract_artifacts@21675b3a7dcdff8e790391708d4763020cace21e # stable action on December 18 2023 + uses: ./.github/actions/build_contract_artifacts with: ref: ${{ needs.get_solana_sha.outputs.sha }} + image: projectserum/build + image-version: ${{ needs.get_projectserum_version.outputs.projectserum_version }} e2e_custom_build_custom_chainlink_image: name: E2E Custom Build Custom CL Image diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml index 5f8407cc4..5727635a4 100644 --- a/.github/workflows/integration-tests-publish.yml +++ b/.github/workflows/integration-tests-publish.yml @@ -33,16 +33,19 @@ jobs: contents: read runs-on: ubuntu-latest needs: [get-projectserum-version] - container: - image: projectserum/build:${{ needs.get-projectserum-version.outputs.projectserum_version }} - env: - RUSTUP_HOME: "/root/.rustup" - FORCE_COLOR: 1 + # container: + # image: projectserum/build:${{ needs.get-projectserum-version.outputs.projectserum_version }} + # env: + # RUSTUP_HOME: "/root/.rustup" + # FORCE_COLOR: 1 steps: - name: Checkout the repo uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - name: Build contracts uses: ./.github/actions/build_contract_artifacts + with: + image: projectserum/build + image-version: ${{ needs.get-projectserum-version.outputs.projectserum_version }} publish-integration-test-image: environment: integration diff --git a/.github/workflows/soak.yml b/.github/workflows/soak.yml index b49882c4c..cceb1c8ce 100644 --- a/.github/workflows/soak.yml +++ b/.github/workflows/soak.yml @@ -67,17 +67,20 @@ jobs: contents: read runs-on: ubuntu-latest needs: [get_projectserum_version, test-image-exists] - container: - image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} - env: - RUSTUP_HOME: "/root/.rustup" - FORCE_COLOR: 1 + # container: + # image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} + # env: + # RUSTUP_HOME: "/root/.rustup" + # FORCE_COLOR: 1 steps: - name: Checkout the repo uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 - name: Build contracts if: needs.test-image-exists.outputs.exists == 'false' uses: ./.github/actions/build_contract_artifacts + with: + image: projectserum/build + image-version: ${{ needs.get_projectserum_version.outputs.projectserum_version }} soak_testing_build_custom_chainlink_image: name: Soak Testing Build Custom Chainlink Image diff --git a/scripts/build-contract-artifacts-action.sh b/scripts/build-contract-artifacts-action.sh new file mode 100755 index 000000000..8e404bb68 --- /dev/null +++ b/scripts/build-contract-artifacts-action.sh @@ -0,0 +1,65 @@ +#!/usr/bin/env bash +set -eoux pipefail + +export RUSTUP_HOME="/root/.rustup" +export FORCE_COLOR=1 + +WORKDIR=$(pwd) +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +REPO=${SCRIPT_DIR}/../ +CONTRACTS=${REPO}/contracts + +yarndir=$(which yarn) + +function printthepaths () { + cd "${REPO}" + echo "yarn: " + which yarn || true + echo "go: " + which go || true + echo "anchor: " + which anchor || true + echo "anchor-go: " + which anchor-go || true + cd "${WORKDIR}" +} + +# install go +apt-get update +apt-get install -y wget +wget https://golang.org/dl/go1.21.7.linux-amd64.tar.gz +tar -xvf go1.21.7.linux-amd64.tar.gz +mv go /usr/local +export PATH=/usr/local/go/bin:$PATH +export GOPATH=$HOME/go +export GOBIN=$GOPATH/bin +export PATH=$GOBIN:$PATH +go version + +# install git +apt-get install software-properties-common -y +add-apt-repository ppa:git-core/ppa +apt update +apt install git -y + +# install achor-go +go install github.com/gagliardetto/anchor-go@v0.2.3 + +# initial build +cd "${CONTRACTS}" +yarn install --frozen-lockfile +anchor build + +# generate contract artifacts +cd "${REPO}" +./scripts/anchor-go-gen.sh + +# check if the go interfaces have changed +git diff --stat --exit-code + +# generate program keys +./scripts/programs-keys-gen.sh + +# build the contracts with updated keys +cd "${CONTRACTS}" +anchor build From 52a7d39184014b88ec1c509ad257b8906dd015b9 Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 11:29:22 -0600 Subject: [PATCH 26/39] update checkout version --- .../actions/build_contract_artifacts/action.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/contract-release.yml | 16 +++++++++------- .github/workflows/e2e_custom_cl.yml | 8 ++++---- .github/workflows/gauntlet.yml | 8 ++++---- .github/workflows/integration-tests-publish.yml | 6 +++--- .github/workflows/lint-gh-workflows.yml | 2 +- .github/workflows/relay.yml | 2 +- .github/workflows/rust.yml | 6 +++--- .github/workflows/soak.yml | 6 +++--- 10 files changed, 30 insertions(+), 28 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index fa308f9cd..fd9d860d4 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -32,7 +32,7 @@ runs: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Checkout solana if: ${{ inputs.image == "" && inputs.image-version == "" }} - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: repository: smartcontractkit/chainlink-solana ref: ${{ inputs.ref }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 4962203f2..ccbb28c2b 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Set up Go uses: actions/setup-go@v3 diff --git a/.github/workflows/contract-release.yml b/.github/workflows/contract-release.yml index d9bad76ac..49780fec8 100644 --- a/.github/workflows/contract-release.yml +++ b/.github/workflows/contract-release.yml @@ -16,7 +16,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -24,14 +24,16 @@ jobs: name: Release Artifacts runs-on: ubuntu-latest needs: [get_projectserum_version] - container: - image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} - env: - RUSTUP_HOME: "/root/.rustup" + # container: + # image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} + # env: + # RUSTUP_HOME: "/root/.rustup" steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Build Artifacts - run: anchor build + env: + psversion: ${{ needs.get_projectserum_version.outputs.projectserum_version }} + run: docker run -v $(pwd):/repo projectserum/build:${psversion} bash -c "anchor build" - name: Generate archive run: | tar cfvz artifacts.tar.gz target/deploy/*.so target/idl/* diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index 660090d77..79bc7cc14 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup go uses: actions/setup-go@v3 with: @@ -42,7 +42,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -62,7 +62,7 @@ jobs: # FORCE_COLOR: 1 steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Build contracts uses: ./.github/actions/build_contract_artifacts with: @@ -147,7 +147,7 @@ jobs: echo "CUSTOM_CORE_REF=${core_ref}" >> "${GITHUB_ENV}" fi - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Download Artifacts uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/gauntlet.yml b/.github/workflows/gauntlet.yml index dc8e73db8..e76b7afb4 100644 --- a/.github/workflows/gauntlet.yml +++ b/.github/workflows/gauntlet.yml @@ -13,7 +13,7 @@ jobs: outputs: nodejs_version: ${{ steps.tool-versions.outputs.nodejs_version }} steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: smartcontractkit/tool-versions-to-env-action@v1.0.8 id: tool-versions @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest needs: [tool_versions] steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} uses: actions/setup-node@v2 with: @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest needs: [tool_versions] steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} uses: actions/setup-node@v2 with: @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-latest needs: [tool_versions] steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} uses: actions/setup-node@v2 with: diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml index 5727635a4..78aae08be 100644 --- a/.github/workflows/integration-tests-publish.yml +++ b/.github/workflows/integration-tests-publish.yml @@ -20,7 +20,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -40,7 +40,7 @@ jobs: # FORCE_COLOR: 1 steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Build contracts uses: ./.github/actions/build_contract_artifacts with: @@ -66,7 +66,7 @@ jobs: this-job-name: Publish Integration Test Image continue-on-error: true - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: ref: ${{ github.event.pull_request.head.sha }} - name: Build Image diff --git a/.github/workflows/lint-gh-workflows.yml b/.github/workflows/lint-gh-workflows.yml index 789eef560..d73bea3fe 100644 --- a/.github/workflows/lint-gh-workflows.yml +++ b/.github/workflows/lint-gh-workflows.yml @@ -7,6 +7,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out Code - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Run actionlint uses: reviewdog/action-actionlint@7556c222a14ff4583c0f772caeb7f65bb3816dc1 # v1.34.0 diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml index a7f94bcbf..18cac6b2c 100644 --- a/.github/workflows/relay.yml +++ b/.github/workflows/relay.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup go uses: actions/setup-go@v3 with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 7eec6563a..6db6a927b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,7 +17,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -33,7 +33,7 @@ jobs: FORCE_COLOR: 1 steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Cache cargo registry uses: actions/cache@v2.1.7 with: @@ -76,7 +76,7 @@ jobs: FORCE_COLOR: 1 steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Cache cargo registry uses: actions/cache@v2.1.7 with: diff --git a/.github/workflows/soak.yml b/.github/workflows/soak.yml index cceb1c8ce..d58ee80df 100644 --- a/.github/workflows/soak.yml +++ b/.github/workflows/soak.yml @@ -34,7 +34,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -74,7 +74,7 @@ jobs: # FORCE_COLOR: 1 steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Build contracts if: needs.test-image-exists.outputs.exists == 'false' uses: ./.github/actions/build_contract_artifacts @@ -130,7 +130,7 @@ jobs: SELECTED_NETWORKS: SIMULATED steps: - name: Checkout the repo - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: ref: ${{ env.REF_NAME }} - name: Build Test Image From 8af6f19d9b0ee42da5c633769a2ada61a1d76403 Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 11:33:11 -0600 Subject: [PATCH 27/39] cleanup issues and debug block --- .../actions/build_contract_artifacts/action.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index fd9d860d4..3e469d18b 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -15,13 +15,13 @@ runs: using: composite steps: - name: Docker run - if: ${{ inputs.image != "" && inputs.image-version != "" }} + if: ${{ inputs.image != '' && inputs.image-version != '' }} shell: bash run: docker run -v $(pwd):/repo projectserum/build:v0.27.0 bash -c "/repo/scripts/build-contract-artifacts-action.sh" # should be used again after moving from projectserum/build to backpackapp/build - name: Install latest Git version (>= 2.18.0) for actions/checkout - if: ${{ inputs.image == "" && inputs.image-version == "" }} + if: ${{ inputs.image == '' && inputs.image-version == '' }} shell: bash run: | apt-get update @@ -31,35 +31,35 @@ runs: apt install git -y git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Checkout solana - if: ${{ inputs.image == "" && inputs.image-version == "" }} + if: ${{ inputs.image == '' && inputs.image-version == '' }} uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: repository: smartcontractkit/chainlink-solana ref: ${{ inputs.ref }} - name: Setup go - if: ${{ inputs.image == "" && inputs.image-version == "" }} + if: ${{ inputs.image == '' && inputs.image-version == '' }} uses: actions/setup-go@v4 with: go-version-file: "go.mod" check-latest: true - name: Generate build artifacts for go bindings check - if: ${{ inputs.image == "" && inputs.image-version == "" }} + if: ${{ inputs.image == '' && inputs.image-version == '' }} shell: bash run: anchor build working-directory: contracts - name: Check generated go bindings are up to date - if: ${{ inputs.image == "" && inputs.image-version == "" }} + if: ${{ inputs.image == '' && inputs.image-version == '' }} shell: bash run: | go install github.com/gagliardetto/anchor-go@v0.2.3 ./scripts/anchor-go-gen.sh git diff --stat --exit-code - name: Generate program_ids - if: ${{ inputs.image == "" && inputs.image-version == "" }} + if: ${{ inputs.image == '' && inputs.image-version == '' }} shell: bash run: ./scripts/programs-keys-gen.sh - name: Generate build artifacts with custom program_ids - if: ${{ inputs.image == "" && inputs.image-version == "" }} + if: ${{ inputs.image == '' && inputs.image-version == '' }} shell: bash run: anchor build working-directory: contracts From 6fdf090d09fec2b431bbb08fc650419ce4d10db3 Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 11:40:21 -0600 Subject: [PATCH 28/39] add github workspace arg to script --- .../build_contract_artifacts/action.yml | 2 +- .github/workflows/contract-release.yml | 2 +- scripts/build-contract-artifacts-action.sh | 18 ++---------------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index 3e469d18b..d8c38e0d5 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -17,7 +17,7 @@ runs: - name: Docker run if: ${{ inputs.image != '' && inputs.image-version != '' }} shell: bash - run: docker run -v $(pwd):/repo projectserum/build:v0.27.0 bash -c "/repo/scripts/build-contract-artifacts-action.sh" + run: docker run -v $(pwd):/repo projectserum/build:v0.27.0 bash -c "/repo/scripts/build-contract-artifacts-action.sh \"${GITHUB_WORKSPACE}\"" # should be used again after moving from projectserum/build to backpackapp/build - name: Install latest Git version (>= 2.18.0) for actions/checkout diff --git a/.github/workflows/contract-release.yml b/.github/workflows/contract-release.yml index 49780fec8..eeaef9b96 100644 --- a/.github/workflows/contract-release.yml +++ b/.github/workflows/contract-release.yml @@ -33,7 +33,7 @@ jobs: - name: Build Artifacts env: psversion: ${{ needs.get_projectserum_version.outputs.projectserum_version }} - run: docker run -v $(pwd):/repo projectserum/build:${psversion} bash -c "anchor build" + run: docker run -v $(pwd):/repo projectserum/build:"${psversion}"" bash -c "anchor build" - name: Generate archive run: | tar cfvz artifacts.tar.gz target/deploy/*.so target/idl/* diff --git a/scripts/build-contract-artifacts-action.sh b/scripts/build-contract-artifacts-action.sh index 8e404bb68..65dd28121 100755 --- a/scripts/build-contract-artifacts-action.sh +++ b/scripts/build-contract-artifacts-action.sh @@ -4,26 +4,10 @@ set -eoux pipefail export RUSTUP_HOME="/root/.rustup" export FORCE_COLOR=1 -WORKDIR=$(pwd) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) REPO=${SCRIPT_DIR}/../ CONTRACTS=${REPO}/contracts -yarndir=$(which yarn) - -function printthepaths () { - cd "${REPO}" - echo "yarn: " - which yarn || true - echo "go: " - which go || true - echo "anchor: " - which anchor || true - echo "anchor-go: " - which anchor-go || true - cd "${WORKDIR}" -} - # install go apt-get update apt-get install -y wget @@ -41,6 +25,8 @@ apt-get install software-properties-common -y add-apt-repository ppa:git-core/ppa apt update apt install git -y +cd "${REPO}" +git config --global --add safe.directory "$1" # install achor-go go install github.com/gagliardetto/anchor-go@v0.2.3 From 282b05ccdf799aaaa1ffe796f8a74e19900a9d7b Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 11:45:10 -0600 Subject: [PATCH 29/39] Use safe git path within container --- .github/actions/build_contract_artifacts/action.yml | 2 +- scripts/build-contract-artifacts-action.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index d8c38e0d5..3e469d18b 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -17,7 +17,7 @@ runs: - name: Docker run if: ${{ inputs.image != '' && inputs.image-version != '' }} shell: bash - run: docker run -v $(pwd):/repo projectserum/build:v0.27.0 bash -c "/repo/scripts/build-contract-artifacts-action.sh \"${GITHUB_WORKSPACE}\"" + run: docker run -v $(pwd):/repo projectserum/build:v0.27.0 bash -c "/repo/scripts/build-contract-artifacts-action.sh" # should be used again after moving from projectserum/build to backpackapp/build - name: Install latest Git version (>= 2.18.0) for actions/checkout diff --git a/scripts/build-contract-artifacts-action.sh b/scripts/build-contract-artifacts-action.sh index 65dd28121..a5ec5f3be 100755 --- a/scripts/build-contract-artifacts-action.sh +++ b/scripts/build-contract-artifacts-action.sh @@ -26,7 +26,7 @@ add-apt-repository ppa:git-core/ppa apt update apt install git -y cd "${REPO}" -git config --global --add safe.directory "$1" +git config --global --add safe.directory "${REPO}" # install achor-go go install github.com/gagliardetto/anchor-go@v0.2.3 From 3b02ed88c2fd7319c19706a02603dd093f34a326 Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 12:12:42 -0600 Subject: [PATCH 30/39] break up the docker commands to use github git diff since it doesn't play nice in the container --- .../build_contract_artifacts/action.yml | 48 ++++++++++++++----- scripts/build-contract-artifacts-action.sh | 12 ++--- 2 files changed, 41 insertions(+), 19 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index 3e469d18b..7ae9a2df6 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -14,14 +14,12 @@ inputs: runs: using: composite steps: - - name: Docker run - if: ${{ inputs.image != '' && inputs.image-version != '' }} - shell: bash - run: docker run -v $(pwd):/repo projectserum/build:v0.27.0 bash -c "/repo/scripts/build-contract-artifacts-action.sh" - - # should be used again after moving from projectserum/build to backpackapp/build + - name: Checkout solana + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + with: + repository: smartcontractkit/chainlink-solana + ref: ${{ inputs.ref }} - name: Install latest Git version (>= 2.18.0) for actions/checkout - if: ${{ inputs.image == '' && inputs.image-version == '' }} shell: bash run: | apt-get update @@ -30,12 +28,36 @@ runs: apt update apt install git -y git config --global --add safe.directory "$GITHUB_WORKSPACE" - - name: Checkout solana - if: ${{ inputs.image == '' && inputs.image-version == '' }} - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - with: - repository: smartcontractkit/chainlink-solana - ref: ${{ inputs.ref }} + + # temporary docker run to build artifacts + - name: Builder Start + if: ${{ inputs.image != '' && inputs.image-version != '' }} + env: + image: ${{ inputs.image }} + image_version: ${{ inputs.image-version }} + shell: bash + run: docker run -d -v $(pwd):/repo --name build-container "${image}":"${image_version}" tail -f /dev/null + - name: Docker build + if: ${{ inputs.image != '' && inputs.image-version != '' }} + shell: bash + run: docker exec -it build-container bash -c "/repo/scripts/build-contract-artifacts-action.sh" + - name: Check generated go bindings are up to date + if: ${{ inputs.image != '' && inputs.image-version != '' }} + shell: bash + run: git diff --stat --exit-code + - name: Docker generate keys and build + if: ${{ inputs.image != '' && inputs.image-version != '' }} + shell: bash + run: | + docker exec -it build-container bash -c "\ + export RUSTUP_HOME=\"/root/.rustup\" &&\ + cd /repo &&\ + ./scripts/programs-keys-gen.sh &&\ + cd ./contracts &&\ + anchor build" + + + # should be used again after moving from projectserum/build to backpackapp/build - name: Setup go if: ${{ inputs.image == '' && inputs.image-version == '' }} uses: actions/setup-go@v4 diff --git a/scripts/build-contract-artifacts-action.sh b/scripts/build-contract-artifacts-action.sh index a5ec5f3be..3d8d33405 100755 --- a/scripts/build-contract-artifacts-action.sh +++ b/scripts/build-contract-artifacts-action.sh @@ -41,11 +41,11 @@ cd "${REPO}" ./scripts/anchor-go-gen.sh # check if the go interfaces have changed -git diff --stat --exit-code +# git diff --stat --exit-code -# generate program keys -./scripts/programs-keys-gen.sh +# # generate program keys +# ./scripts/programs-keys-gen.sh -# build the contracts with updated keys -cd "${CONTRACTS}" -anchor build +# # build the contracts with updated keys +# cd "${CONTRACTS}" +# anchor build From 3607775bda30b15c75f1d2db1eeefd9c22b178ad Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 12:17:59 -0600 Subject: [PATCH 31/39] move git install into section where we only do it when running inside of the container --- .../build_contract_artifacts/action.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index 7ae9a2df6..14e97673b 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -19,15 +19,6 @@ runs: with: repository: smartcontractkit/chainlink-solana ref: ${{ inputs.ref }} - - name: Install latest Git version (>= 2.18.0) for actions/checkout - shell: bash - run: | - apt-get update - apt-get install software-properties-common -y - add-apt-repository ppa:git-core/ppa - apt update - apt install git -y - git config --global --add safe.directory "$GITHUB_WORKSPACE" # temporary docker run to build artifacts - name: Builder Start @@ -56,8 +47,17 @@ runs: cd ./contracts &&\ anchor build" - # should be used again after moving from projectserum/build to backpackapp/build + - name: Install latest Git version (>= 2.18.0) for actions/checkout + if: ${{ inputs.image == '' && inputs.image-version == '' }} + shell: bash + run: | + apt-get update + apt-get install software-properties-common -y + add-apt-repository ppa:git-core/ppa + apt update + apt install git -y + git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Setup go if: ${{ inputs.image == '' && inputs.image-version == '' }} uses: actions/setup-go@v4 From 6127cfc498f1c49118af36d74d619be5cb8b7a01 Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 12:22:12 -0600 Subject: [PATCH 32/39] remove interactive mode --- .github/actions/build_contract_artifacts/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index 14e97673b..cd6355b2d 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -31,7 +31,7 @@ runs: - name: Docker build if: ${{ inputs.image != '' && inputs.image-version != '' }} shell: bash - run: docker exec -it build-container bash -c "/repo/scripts/build-contract-artifacts-action.sh" + run: docker exec build-container bash -c "/repo/scripts/build-contract-artifacts-action.sh" - name: Check generated go bindings are up to date if: ${{ inputs.image != '' && inputs.image-version != '' }} shell: bash @@ -40,7 +40,7 @@ runs: if: ${{ inputs.image != '' && inputs.image-version != '' }} shell: bash run: | - docker exec -it build-container bash -c "\ + docker exec build-container bash -c "\ export RUSTUP_HOME=\"/root/.rustup\" &&\ cd /repo &&\ ./scripts/programs-keys-gen.sh &&\ From 2eed9f3c144e76074789594ee3e47c626b894090 Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 12:33:18 -0600 Subject: [PATCH 33/39] adjust artifact permissions after docker build for upload --- .github/actions/build_contract_artifacts/action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index cd6355b2d..9b894da92 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -46,6 +46,12 @@ runs: ./scripts/programs-keys-gen.sh &&\ cd ./contracts &&\ anchor build" + docker stop build-container + docker rm build-container + - name: Adjust permissions for artifacts + if: ${{ inputs.image != '' && inputs.image-version != '' }} + run: chmod -R 644 ./contracts/target/deploy/ + # should be used again after moving from projectserum/build to backpackapp/build - name: Install latest Git version (>= 2.18.0) for actions/checkout From 847c9b3e491f53478c3e3c25ab4604b3e3af0feb Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 12:37:54 -0600 Subject: [PATCH 34/39] fix action format error --- .../build_contract_artifacts/action.yml | 41 +++++++++---------- scripts/build-contract-artifacts-action.sh | 10 ----- 2 files changed, 20 insertions(+), 31 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index 9b894da92..3cd1db56e 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -21,36 +21,35 @@ runs: ref: ${{ inputs.ref }} # temporary docker run to build artifacts - - name: Builder Start + - name: Docker Builder if: ${{ inputs.image != '' && inputs.image-version != '' }} env: image: ${{ inputs.image }} image_version: ${{ inputs.image-version }} shell: bash - run: docker run -d -v $(pwd):/repo --name build-container "${image}":"${image_version}" tail -f /dev/null - - name: Docker build - if: ${{ inputs.image != '' && inputs.image-version != '' }} - shell: bash - run: docker exec build-container bash -c "/repo/scripts/build-contract-artifacts-action.sh" - - name: Check generated go bindings are up to date - if: ${{ inputs.image != '' && inputs.image-version != '' }} - shell: bash - run: git diff --stat --exit-code - - name: Docker generate keys and build - if: ${{ inputs.image != '' && inputs.image-version != '' }} - shell: bash run: | + # start container + docker run -d -v $(pwd):/repo --name build-container "${image}":"${image_version}" tail -f /dev/null + # generate go bindings + docker exec build-container bash -c "\ + chown -R $(id -u):$(id -g) /repo &&\ + /repo/scripts/build-contract-artifacts-action.sh" + # check go bindings + git diff --stat --exit-code + # build with keys docker exec build-container bash -c "\ - export RUSTUP_HOME=\"/root/.rustup\" &&\ - cd /repo &&\ - ./scripts/programs-keys-gen.sh &&\ - cd ./contracts &&\ - anchor build" + export RUSTUP_HOME=\"/root/.rustup\" &&\ + cd /repo &&\ + ./scripts/programs-keys-gen.sh &&\ + cd ./contracts &&\ + anchor build &&\ + chown -R $(id -u):$(id -g) /repo" + # clean up the container docker stop build-container docker rm build-container - - name: Adjust permissions for artifacts - if: ${{ inputs.image != '' && inputs.image-version != '' }} - run: chmod -R 644 ./contracts/target/deploy/ + # fix upload permissions + # chown -R $(whoami):$(whoami) ./contracts/target/deploy/ + # chmod -R 644 ./contracts/target/deploy/ # should be used again after moving from projectserum/build to backpackapp/build diff --git a/scripts/build-contract-artifacts-action.sh b/scripts/build-contract-artifacts-action.sh index 3d8d33405..4aa2781b3 100755 --- a/scripts/build-contract-artifacts-action.sh +++ b/scripts/build-contract-artifacts-action.sh @@ -39,13 +39,3 @@ anchor build # generate contract artifacts cd "${REPO}" ./scripts/anchor-go-gen.sh - -# check if the go interfaces have changed -# git diff --stat --exit-code - -# # generate program keys -# ./scripts/programs-keys-gen.sh - -# # build the contracts with updated keys -# cd "${CONTRACTS}" -# anchor build From 224bd4e6b8cf28dc68d1b1efd6bc3b476abd7275 Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 13:58:49 -0600 Subject: [PATCH 35/39] fix rust lint and test --- .../build_contract_artifacts/action.yml | 8 +- .github/workflows/contract-release.yml | 5 +- .github/workflows/rust.yml | 77 ++++++++++++++----- Makefile | 2 +- 4 files changed, 62 insertions(+), 30 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index 3cd1db56e..86d6c43dd 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -31,9 +31,7 @@ runs: # start container docker run -d -v $(pwd):/repo --name build-container "${image}":"${image_version}" tail -f /dev/null # generate go bindings - docker exec build-container bash -c "\ - chown -R $(id -u):$(id -g) /repo &&\ - /repo/scripts/build-contract-artifacts-action.sh" + docker exec build-container bash -c "/repo/scripts/build-contract-artifacts-action.sh" # check go bindings git diff --stat --exit-code # build with keys @@ -47,10 +45,6 @@ runs: # clean up the container docker stop build-container docker rm build-container - # fix upload permissions - # chown -R $(whoami):$(whoami) ./contracts/target/deploy/ - # chmod -R 644 ./contracts/target/deploy/ - # should be used again after moving from projectserum/build to backpackapp/build - name: Install latest Git version (>= 2.18.0) for actions/checkout diff --git a/.github/workflows/contract-release.yml b/.github/workflows/contract-release.yml index eeaef9b96..685315943 100644 --- a/.github/workflows/contract-release.yml +++ b/.github/workflows/contract-release.yml @@ -33,7 +33,10 @@ jobs: - name: Build Artifacts env: psversion: ${{ needs.get_projectserum_version.outputs.projectserum_version }} - run: docker run -v $(pwd):/repo projectserum/build:"${psversion}"" bash -c "anchor build" + run: | + docker run -v $(pwd):/repo projectserum/build:"${psversion}" bash -c "\ + anchor build &&\ + chown -R $(id -u):$(id -g) /repo" - name: Generate archive run: | tar cfvz artifacts.tar.gz target/deploy/*.so target/idl/* diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6db6a927b..127207ba1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -27,10 +27,10 @@ jobs: runs-on: ubuntu-latest needs: [get_projectserum_version] container: - image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} - env: - RUSTUP_HOME: "/root/.rustup" - FORCE_COLOR: 1 + # image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} + # env: + # RUSTUP_HOME: "/root/.rustup" + # FORCE_COLOR: 1 steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 @@ -52,28 +52,51 @@ jobs: path: contracts/target key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} - - run: solana-keygen new -o id.json --no-bip39-passphrase - - name: Compile typescript client + - name: run tests + env: + psversion: ${{ needs.get_projectserum_version.outputs.projectserum_version }} run: | - cd ../ts - yarn install --frozen-lockfile - yarn build - - run: yarn install --frozen-lockfile - - run: anchor test - - run: | - cd examples/hello-world - yarn install --frozen-lockfile - anchor test + docker run -v "$(pwd)/../":/repo projectserum/build:"${psversion}" bash -c "\ + set -eoux pipefail &&\ + RUSTUP_HOME=\"/root/.rustup\" &&\ + FORCE_COLOR=1 &&\ + cd /repo/contracts &&\ + solana-keygen new -o id.json --no-bip39-passphrase &&\ + cd /repo/ts &&\ + yarn install --frozen-lockfile &&\ + yarn build &&\ + cd /repo/contracts &&\ + yarn install --frozen-lockfile &&\ + anchor test &&\ + cd /repo/examples/hello-world &&\ + yarn install --frozen-lockfile &&\ + anchor test" + + # - run: solana-keygen new -o id.json --no-bip39-passphrase + # - name: Compile typescript client + # run: | + # cd ../ts + # yarn install --frozen-lockfile + # yarn build + # - name: anchor test contracts + # run: | + # yarn install --frozen-lockfile + # anchor test + # - name: anchor test hello-world + # run: | + # cd examples/hello-world + # yarn install --frozen-lockfile + # anchor test rust_lint: name: Rust Lint runs-on: ubuntu-latest needs: [get_projectserum_version] container: - image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} - env: - RUSTUP_HOME: "/root/.rustup" - FORCE_COLOR: 1 + # image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} + # env: + # RUSTUP_HOME: "/root/.rustup" + # FORCE_COLOR: 1 steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 @@ -95,5 +118,17 @@ jobs: path: contracts/target key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} - - run: cargo check - - run: cargo clippy -- -D warnings + - name: cargo check + env: + psversion: ${{ needs.get_projectserum_version.outputs.projectserum_version }} + run: | + docker run -v "$(pwd)/../":/repo projectserum/build:"${psversion}" bash -c "\ + set -eoux pipefail &&\ + RUSTUP_HOME=\"/root/.rustup\" &&\ + FORCE_COLOR=1 &&\ + cd /repo/contracts &&\ + cargo check &&\ + cargo clippy -- -D warnings" + + # - run: cargo check + # - run: cargo clippy -- -D warnings diff --git a/Makefile b/Makefile index a1adf0dec..2e046b79f 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BIN_DIR = bin export GOPATH ?= $(shell go env GOPATH) export GO111MODULE ?= on -export PROJECT_SERUM_VERSION ?=v0.25.0 +export PROJECT_SERUM_VERSION ?=v0.27.0 export PROJECT_SERUM_IMAGE ?= projectserum/build:$(PROJECT_SERUM_VERSION) LINUX=LINUX From 97d6db253497bf009f0d3202a8f4d40116c4a8c8 Mon Sep 17 00:00:00 2001 From: Tate Date: Thu, 9 May 2024 14:21:33 -0600 Subject: [PATCH 36/39] path and lint fixes --- .github/workflows/contract-release.yml | 2 +- .github/workflows/rust.yml | 2 +- Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/contract-release.yml b/.github/workflows/contract-release.yml index 685315943..826cbe0ed 100644 --- a/.github/workflows/contract-release.yml +++ b/.github/workflows/contract-release.yml @@ -34,7 +34,7 @@ jobs: env: psversion: ${{ needs.get_projectserum_version.outputs.projectserum_version }} run: | - docker run -v $(pwd):/repo projectserum/build:"${psversion}" bash -c "\ + docker run -v "$(pwd)":/repo projectserum/build:"${psversion}" bash -c "\ anchor build &&\ chown -R $(id -u):$(id -g) /repo" - name: Generate archive diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 127207ba1..008401ec8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -68,7 +68,7 @@ jobs: cd /repo/contracts &&\ yarn install --frozen-lockfile &&\ anchor test &&\ - cd /repo/examples/hello-world &&\ + cd /repo/contracts/examples/hello-world &&\ yarn install --frozen-lockfile &&\ anchor test" diff --git a/Makefile b/Makefile index 2e046b79f..a1adf0dec 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BIN_DIR = bin export GOPATH ?= $(shell go env GOPATH) export GO111MODULE ?= on -export PROJECT_SERUM_VERSION ?=v0.27.0 +export PROJECT_SERUM_VERSION ?=v0.25.0 export PROJECT_SERUM_IMAGE ?= projectserum/build:$(PROJECT_SERUM_VERSION) LINUX=LINUX From 05c5dcdcd4f88f785c9aacaf0a46169a5c3c8040 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Fri, 10 May 2024 10:34:13 -0500 Subject: [PATCH 37/39] chore: full bump after node20 solana build --- .../build_contract_artifacts/action.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/contract-release.yml | 4 ++-- .github/workflows/e2e_custom_cl.yml | 8 ++++---- .github/workflows/e2e_testnet_daily.yml | 17 +++++++++-------- .github/workflows/gauntlet.yml | 10 +++++----- .github/workflows/golangci-lint.yml | 4 ++-- .../workflows/integration-tests-publish.yml | 6 +++--- .github/workflows/lint-gh-workflows.yml | 2 +- .github/workflows/monitoring.yml | 2 +- .github/workflows/open-pr.yml | 2 +- .github/workflows/relay.yml | 2 +- .github/workflows/rust.yml | 18 +++++++++--------- .github/workflows/soak.yml | 6 +++--- .github/workflows/sonar-scan.yml | 6 +++--- .github/workflows/upstream-tracker.yml | 2 +- 16 files changed, 49 insertions(+), 48 deletions(-) diff --git a/.github/actions/build_contract_artifacts/action.yml b/.github/actions/build_contract_artifacts/action.yml index 86d6c43dd..155f1bcb4 100644 --- a/.github/actions/build_contract_artifacts/action.yml +++ b/.github/actions/build_contract_artifacts/action.yml @@ -15,7 +15,7 @@ runs: using: composite steps: - name: Checkout solana - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: repository: smartcontractkit/chainlink-solana ref: ${{ inputs.ref }} @@ -59,7 +59,7 @@ runs: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Setup go if: ${{ inputs.image == '' && inputs.image-version == '' }} - uses: actions/setup-go@v4 + uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version-file: "go.mod" check-latest: true @@ -87,7 +87,7 @@ runs: #save the contracts artifacts - name: Upload Artifacts - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: name: artifacts path: contracts/target/deploy diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 5cb389eef..206612f29 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Set up Go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 diff --git a/.github/workflows/contract-release.yml b/.github/workflows/contract-release.yml index 745e21d47..64343179a 100644 --- a/.github/workflows/contract-release.yml +++ b/.github/workflows/contract-release.yml @@ -16,7 +16,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -29,7 +29,7 @@ jobs: # env: # RUSTUP_HOME: "/root/.rustup" steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Build Artifacts env: psversion: ${{ needs.get_projectserum_version.outputs.projectserum_version }} diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index 9c09e5508..3ff6769e4 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Setup go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: @@ -42,7 +42,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -62,7 +62,7 @@ jobs: # FORCE_COLOR: 1 steps: - name: Checkout the repo - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Build contracts uses: ./.github/actions/build_contract_artifacts with: @@ -149,7 +149,7 @@ jobs: echo "CUSTOM_CORE_REF=${core_ref}" >> "${GITHUB_ENV}" fi - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Download Artifacts uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 with: diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml index 80eb52af3..9ee1a434d 100644 --- a/.github/workflows/e2e_testnet_daily.yml +++ b/.github/workflows/e2e_testnet_daily.yml @@ -49,7 +49,7 @@ jobs: this-job-name: Check Paths That Require Tests To Run continue-on-error: true - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 id: changes with: @@ -71,7 +71,7 @@ jobs: sha: ${{ github.sha }} steps: - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }} - name: Setup Go @@ -85,7 +85,7 @@ jobs: echo "short sha is: ${short_sha}" echo "short_sha=${short_sha}" >> "$GITHUB_OUTPUT" - name: Checkout solana - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: repository: smartcontractkit/chainlink-solana ref: develop @@ -101,7 +101,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the solana repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: repository: smartcontractkit/chainlink-solana ref: ${{ needs.get_solana_sha.outputs.sha }} @@ -150,8 +150,9 @@ jobs: - name: Collect Metrics if: needs.changes.outputs.src == 'true' id: collect-gha-metrics - uses: smartcontractkit/push-gha-metrics-action@0281b09807758be1dcc41651e44e62b353808c47 # v2.1.0 + uses: smartcontractkit/push-gha-metrics-action@dea9b546553cb4ca936607c2267a09c004e4ab3f # v3.0.0 with: + id: e2e_testnet_daily-build-artifacts org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }} basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }} hostname: ${{ secrets.GRAFANA_INTERNAL_HOST }} @@ -160,7 +161,7 @@ jobs: - name: Checkout the solana repo # Use v3.6.0 because the custom runner (container configured above) # doesn't have node20 installed which is required for versions >=4 - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: repository: smartcontractkit/chainlink-solana ref: ${{ needs.get_solana_sha.outputs.sha }} @@ -220,7 +221,7 @@ jobs: this-job-name: Build Test Image continue-on-error: true - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }} - name: Build Test Image @@ -274,7 +275,7 @@ jobs: this-job-name: E2E Run Daily Smoke Tests continue-on-error: true - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Run Tests uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@e29366cdecfe6befff9ab8c3cfe4825218505d58 # v2.3.16 with: diff --git a/.github/workflows/gauntlet.yml b/.github/workflows/gauntlet.yml index a8d4f2f59..c2b7207ff 100644 --- a/.github/workflows/gauntlet.yml +++ b/.github/workflows/gauntlet.yml @@ -13,7 +13,7 @@ jobs: outputs: nodejs_version: ${{ steps.tool-versions.outputs.nodejs_version }} steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - uses: smartcontractkit/tool-versions-to-env-action@v1.0.8 id: tool-versions @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest needs: [tool_versions] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest needs: [tool_versions] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: @@ -55,7 +55,7 @@ jobs: CI: true runs-on: ubuntu-latest steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Install Nix uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: @@ -80,7 +80,7 @@ jobs: runs-on: ubuntu-latest needs: [tool_versions] steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Setup Node ${{ needs.tool_versions.outputs.nodejs_version }} uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 8f5cef3c5..18f1cbe66 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Install Nix uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Install Nix uses: cachix/install-nix-action@8887e596b4ee1134dae06b98d573bd674693f47c # v26 with: diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml index 67ebfca00..f03809af1 100644 --- a/.github/workflows/integration-tests-publish.yml +++ b/.github/workflows/integration-tests-publish.yml @@ -20,7 +20,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -40,7 +40,7 @@ jobs: # FORCE_COLOR: 1 steps: - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Build contracts uses: ./.github/actions/build_contract_artifacts with: @@ -67,7 +67,7 @@ jobs: this-job-name: Publish Integration Test Image continue-on-error: true - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: ref: ${{ github.event.pull_request.head.sha }} - name: Build Image diff --git a/.github/workflows/lint-gh-workflows.yml b/.github/workflows/lint-gh-workflows.yml index 2072dbbe5..dff9f7fd0 100644 --- a/.github/workflows/lint-gh-workflows.yml +++ b/.github/workflows/lint-gh-workflows.yml @@ -7,6 +7,6 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out Code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Run actionlint uses: reviewdog/action-actionlint@51bfb044ddaed55059d16f14daedbe05a9937dc1 # v1.45.0 diff --git a/.github/workflows/monitoring.yml b/.github/workflows/monitoring.yml index 15a1c9159..76ca86c0e 100644 --- a/.github/workflows/monitoring.yml +++ b/.github/workflows/monitoring.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Setup Docker Buildx uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3.3.0 diff --git a/.github/workflows/open-pr.yml b/.github/workflows/open-pr.yml index e1de77de3..71661c422 100644 --- a/.github/workflows/open-pr.yml +++ b/.github/workflows/open-pr.yml @@ -17,7 +17,7 @@ jobs: contents: write runs-on: ubuntu-latest steps: - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: go-version-file: "go.mod" diff --git a/.github/workflows/relay.yml b/.github/workflows/relay.yml index 465e8fc56..d9e47aea2 100644 --- a/.github/workflows/relay.yml +++ b/.github/workflows/relay.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout sources - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Setup go uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index fe392e16e..55ab1115b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,7 +17,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -33,21 +33,21 @@ jobs: # FORCE_COLOR: 1 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Cache cargo registry - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.cargo/registry key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo index - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.cargo/git key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo target dir - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: contracts/target key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} @@ -99,21 +99,21 @@ jobs: # FORCE_COLOR: 1 steps: - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Cache cargo registry - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.cargo/registry key: ${{ runner.os }}-v2-cargo-registry-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo index - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: ~/.cargo/git key: ${{ runner.os }}-v2-cargo-index-${{ hashFiles('**/Cargo.lock') }} - name: Cache cargo target dir - uses: actions/cache@v2.1.7 + uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2 with: path: contracts/target key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }} diff --git a/.github/workflows/soak.yml b/.github/workflows/soak.yml index ed43795b6..1ceb94155 100644 --- a/.github/workflows/soak.yml +++ b/.github/workflows/soak.yml @@ -34,7 +34,7 @@ jobs: projectserum_version: ${{ steps.psversion.outputs.projectserum_version }} steps: - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Get ProjectSerum Version id: psversion uses: ./.github/actions/projectserum_version @@ -74,7 +74,7 @@ jobs: # FORCE_COLOR: 1 steps: - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Build contracts if: needs.test-image-exists.outputs.exists == 'false' uses: ./.github/actions/build_contract_artifacts @@ -131,7 +131,7 @@ jobs: SELECTED_NETWORKS: SIMULATED steps: - name: Checkout the repo - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: ref: ${{ env.REF_NAME }} - name: Build Test Image diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml index 18847e541..2e225e4f1 100644 --- a/.github/workflows/sonar-scan.yml +++ b/.github/workflows/sonar-scan.yml @@ -13,7 +13,7 @@ jobs: if: always() steps: - name: Checkout Repository - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: ref: ${{ github.event.pull_request.head.sha || github.event.merge_group.head_sha }} @@ -33,7 +33,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out Code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Parse tool-versions file uses: smartcontractkit/tool-versions-to-env-action@v1.0.8 id: tool-versions @@ -48,7 +48,7 @@ jobs: if: ${{ always() }} steps: - name: Fetch blame information - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 with: fetch-depth: 0 # fetches all history for all tags and branches to provide more metadata for sonar reports diff --git a/.github/workflows/upstream-tracker.yml b/.github/workflows/upstream-tracker.yml index f5eb74a22..565f9ebfc 100644 --- a/.github/workflows/upstream-tracker.yml +++ b/.github/workflows/upstream-tracker.yml @@ -28,7 +28,7 @@ jobs: echo "closed<> $GITHUB_OUTPUT echo "$CLOSED" >> $GITHUB_OUTPUT echo "EOF" >> $GITHUB_OUTPUT - - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 if: steps.updates.outputs.open || steps.updates.outputs.closed - name: Open Issue if: steps.updates.outputs.open || steps.updates.outputs.closed From 2e0f3bd54848a90fea63e020d8503ed05d85a895 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Fri, 10 May 2024 10:54:17 -0500 Subject: [PATCH 38/39] fix: use download-artifact --- .github/workflows/e2e_custom_cl.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e_custom_cl.yml b/.github/workflows/e2e_custom_cl.yml index 3ff6769e4..a7c40bf2b 100644 --- a/.github/workflows/e2e_custom_cl.yml +++ b/.github/workflows/e2e_custom_cl.yml @@ -151,7 +151,7 @@ jobs: - name: Checkout the repo uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5 - name: Download Artifacts - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 with: name: artifacts path: ${{ env.CONTRACT_ARTIFACTS_PATH }} From 9c551f9121417303df25a17a318b329a3e8b86ad Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Fri, 10 May 2024 11:30:52 -0500 Subject: [PATCH 39/39] fix: comment out container fields --- .github/workflows/e2e_testnet_daily.yml | 2 +- .github/workflows/rust.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e_testnet_daily.yml b/.github/workflows/e2e_testnet_daily.yml index 9ee1a434d..a554d0fd4 100644 --- a/.github/workflows/e2e_testnet_daily.yml +++ b/.github/workflows/e2e_testnet_daily.yml @@ -141,7 +141,7 @@ jobs: solana-test-image-exists, get_solana_sha, ] - container: + # container: # image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} # env: # RUSTUP_HOME: "/root/.rustup" diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 55ab1115b..6d3f36e84 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -26,7 +26,7 @@ jobs: name: Rust Run Anchor Tests runs-on: ubuntu-latest needs: [get_projectserum_version] - container: + # container: # image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} # env: # RUSTUP_HOME: "/root/.rustup" @@ -92,7 +92,7 @@ jobs: name: Rust Lint runs-on: ubuntu-latest needs: [get_projectserum_version] - container: + # container: # image: projectserum/build:${{ needs.get_projectserum_version.outputs.projectserum_version }} # env: # RUSTUP_HOME: "/root/.rustup"