From f810e7aef9c582c8507b8db24b1ab770929c042a Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Wed, 18 Sep 2024 14:34:54 +0200 Subject: [PATCH] update pipeline version, use custom pruning script --- .github/workflows/changeset.yml | 2 +- .github/workflows/ci-core.yml | 6 +++--- .github/workflows/solidity-foundry-artifacts.yml | 7 ++++--- .github/workflows/solidity-foundry.yml | 16 ++++++++-------- .github/workflows/solidity-hardhat.yml | 2 +- .github/workflows/solidity-tracability.yml | 4 ++-- .github/workflows/solidity-wrappers.yml | 2 +- .github/workflows/solidity.yml | 12 ++++++------ 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/.github/workflows/changeset.yml b/.github/workflows/changeset.yml index 8aa2647b701..f0d8eb4bec1 100644 --- a/.github/workflows/changeset.yml +++ b/.github/workflows/changeset.yml @@ -90,7 +90,7 @@ jobs: uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: repository: smartcontractkit/chainlink-github-actions - ref: 21b8f9d34894ba33e2996f7d242bf87677ad5bae + ref: 92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 path: .chainlink-github-actions - name: Update Jira ticket for core diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml index 0079e497652..98399c42b7e 100644 --- a/.github/workflows/ci-core.yml +++ b/.github/workflows/ci-core.yml @@ -126,7 +126,7 @@ jobs: uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 - name: Setup NodeJS if: ${{ needs.filter.outputs.changes == 'true' }} - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' prod: "true" @@ -275,7 +275,7 @@ jobs: uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 - name: Setup NodeJS if: ${{ needs.filter.outputs.changes == 'true' }} - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' prod: "true" @@ -448,7 +448,7 @@ jobs: - name: Install protoc-gen-go-wsrpc run: curl https://github.com/smartcontractkit/wsrpc/raw/main/cmd/protoc-gen-go-wsrpc/protoc-gen-go-wsrpc --output $HOME/go/bin/protoc-gen-go-wsrpc && chmod +x $HOME/go/bin/protoc-gen-go-wsrpc - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' - name: make generate diff --git a/.github/workflows/solidity-foundry-artifacts.yml b/.github/workflows/solidity-foundry-artifacts.yml index 34ff8db4dc8..689c82a7371 100644 --- a/.github/workflows/solidity-foundry-artifacts.yml +++ b/.github/workflows/solidity-foundry-artifacts.yml @@ -147,7 +147,7 @@ jobs: generate-artifacts: name: Generate Solidity Review Artifacts needs: [changes, prepare-workflow-inputs] - uses: smartcontractkit/chainlink-github-actions/.github/workflows/review-artifacts.yml@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/.github/workflows/review-artifacts.yml@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: product: ${{ inputs.product }} commit_to_use: ${{ inputs.commit_to_use }} @@ -158,11 +158,12 @@ jobs: changeset_files: ${{ needs.changes.outputs.changeset_files }} foundry_version: ${{ needs.prepare-workflow-inputs.outputs.foundry_version }} contracts_directory: './contracts' - generate_code_coverage: ${{ needs.prepare-workflow-inputs.outputs.generate_code_coverage }} + generate_code_coverage: ${{ needs.prepare-workflow-inputs.outputs.generate_code_coverage == 'true' }} link_with_jira: ${{ inputs.link_with_jira }} jira_host: ${{ vars.JIRA_HOST }} install_semver: false - slither_config_file_path: "contracts/configs/slither/.slither.config-artifacts.json" + slither_config_file_path: 'contracts/configs/slither/.slither.config-artifacts.json' + lcov_prune_script_path: 'scripts/lcov_prune' secrets: jira_username: ${{ secrets.JIRA_USERNAME }} jira_api_token: ${{ secrets.JIRA_API_TOKEN }} diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml index 3676a24c538..cf3372b48ed 100644 --- a/.github/workflows/solidity-foundry.yml +++ b/.github/workflows/solidity-foundry.yml @@ -160,7 +160,7 @@ jobs: if: ${{ contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) || contains(fromJson(needs.changes.outputs.all_changes), 'shared') || needs.changes.outputs.non_src_changes == 'true' }} - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' @@ -280,11 +280,11 @@ jobs: uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: repository: smartcontractkit/chainlink-github-actions - ref: 21b8f9d34894ba33e2996f7d242bf87677ad5bae + ref: 92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 path: ./chainlink-github-actions - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' @@ -299,13 +299,13 @@ jobs: python-version: '3.8' - name: Install solc-select and solc - uses: smartcontractkit/chainlink-github-actions/solidity/setup-solc-select@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-solc-select@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: to_install: '0.8.24' to_use: '0.8.24' - name: Install Slither - uses: smartcontractkit/chainlink-github-actions/solidity/setup-slither@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-slither@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 - name: Run Slither shell: bash @@ -386,7 +386,7 @@ jobs: # since we have just checked out the repository again, we lose NPM dependencies installs previously, we need to install them again to compile contracts - name: Setup NodeJS if: needs.changes.outputs.sol_mod_only == 'true' - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' @@ -479,7 +479,7 @@ jobs: done - name: Validate if all Slither run for all contracts - uses: smartcontractkit/chainlink-github-actions/solidity/validate-solidity-artifacts@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/validate-solidity-artifacts@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: validate_slither_reports: 'true' slither_reports_path: 'contracts/slither-reports-current' @@ -567,7 +567,7 @@ jobs: - name: Setup NodeJS if: ${{ (contains(fromJson(needs.changes.outputs.all_changes), matrix.product.name) || needs.changes.outputs.non_src_changes == 'true') && matrix.product.setup.run-forge-fmt }} - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' diff --git a/.github/workflows/solidity-hardhat.yml b/.github/workflows/solidity-hardhat.yml index 2a72883c52c..8dedaf35189 100644 --- a/.github/workflows/solidity-hardhat.yml +++ b/.github/workflows/solidity-hardhat.yml @@ -41,7 +41,7 @@ jobs: - name: Checkout the repo uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' - name: Setup Hardhat diff --git a/.github/workflows/solidity-tracability.yml b/.github/workflows/solidity-tracability.yml index 89ad4ad934a..fae056e62d1 100644 --- a/.github/workflows/solidity-tracability.yml +++ b/.github/workflows/solidity-tracability.yml @@ -89,7 +89,7 @@ jobs: exit 1 - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' @@ -97,7 +97,7 @@ jobs: uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: repository: smartcontractkit/chainlink-github-actions - ref: 21b8f9d34894ba33e2996f7d242bf87677ad5bae 21b8f9d34894ba33e2996f7d242bf87677ad5bae + ref: 92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 path: .chainlink-github-actions - name: Setup git top level directory diff --git a/.github/workflows/solidity-wrappers.yml b/.github/workflows/solidity-wrappers.yml index f748f733ef2..bef6dcff64c 100644 --- a/.github/workflows/solidity-wrappers.yml +++ b/.github/workflows/solidity-wrappers.yml @@ -46,7 +46,7 @@ jobs: uses: ./.github/actions/setup-go - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' prod: "true" diff --git a/.github/workflows/solidity.yml b/.github/workflows/solidity.yml index 656c1b2891b..8cd67c54c73 100644 --- a/.github/workflows/solidity.yml +++ b/.github/workflows/solidity.yml @@ -63,7 +63,7 @@ jobs: - name: Checkout the repo uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' - name: Run Prepublish test @@ -97,7 +97,7 @@ jobs: - name: Install diff-so-fancy run: echo "$GITHUB_WORKSPACE/diff-so-fancy" >> $GITHUB_PATH - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' prod: "true" @@ -136,7 +136,7 @@ jobs: - name: Checkout the repo uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' - name: Run pnpm lint @@ -166,7 +166,7 @@ jobs: - name: Checkout the repo uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' - name: Run prettier check @@ -193,7 +193,7 @@ jobs: uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts' @@ -235,7 +235,7 @@ jobs: uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Setup NodeJS - uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@21b8f9d34894ba33e2996f7d242bf87677ad5bae + uses: smartcontractkit/chainlink-github-actions/solidity/setup-nodejs@92e2e0c30dc3cf91a6c73e17b7165c91b8f20416 with: contracts_dir: './contracts'