From af8a365d541040209b164c9016f125e8ee8de9c8 Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 19 Nov 2024 10:41:19 -0800 Subject: [PATCH 1/2] fix: solidity native compile diff checks --- .github/workflows/solidity.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/solidity.yml b/.github/workflows/solidity.yml index c76fbe6b671..c8c3b998232 100644 --- a/.github/workflows/solidity.yml +++ b/.github/workflows/solidity.yml @@ -98,7 +98,8 @@ jobs: - name: Check if Go solidity wrappers are updated if: ${{ needs.changes.outputs.changes == 'true' }} run: | - git add --all + # Add everything except for checked out repo for pretty printing + git add -- . ':!diff-so-fancy' git diff --minimal --color --cached --exit-code | diff-so-fancy # The if statements for steps after checkout repo is a workaround for From ac92504f1e99f7ea516d823e9e066b5f82dd9b3a Mon Sep 17 00:00:00 2001 From: Erik Burton Date: Tue, 19 Nov 2024 16:26:57 -0800 Subject: [PATCH 2/2] fix: checkout repos side-by-side --- .github/workflows/solidity.yml | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/solidity.yml b/.github/workflows/solidity.yml index c8c3b998232..605b3f2e325 100644 --- a/.github/workflows/solidity.yml +++ b/.github/workflows/solidity.yml @@ -76,30 +76,43 @@ jobs: steps: - name: Checkout the repo uses: actions/checkout@v4.2.1 + with: + path: chainlink + - name: Checkout diff-so-fancy uses: actions/checkout@v4.2.1 with: repository: so-fancy/diff-so-fancy ref: a673cb4d2707f64d92b86498a2f5f71c8e2643d5 # v1.4.3 path: diff-so-fancy + - name: Install diff-so-fancy run: echo "$GITHUB_WORKSPACE/diff-so-fancy" >> $GITHUB_PATH + - name: Setup NodeJS - uses: ./.github/actions/setup-nodejs + uses: ./chainlink/.github/actions/setup-nodejs with: + base-path: "chainlink" prod: "true" + - name: Setup Go - uses: ./.github/actions/setup-go + uses: ./chainlink/.github/actions/setup-go + with: + go-version-file: "chainlink/go.mod" + - name: Run native compile and generate wrappers + working-directory: ./chainlink/contracts run: make wrappers-all - working-directory: ./contracts + - name: Verify local solc binaries + working-directory: chainlink run: ./tools/ci/check_solc_hashes + - name: Check if Go solidity wrappers are updated if: ${{ needs.changes.outputs.changes == 'true' }} + working-directory: chainlink run: | - # Add everything except for checked out repo for pretty printing - git add -- . ':!diff-so-fancy' + git add --all git diff --minimal --color --cached --exit-code | diff-so-fancy # The if statements for steps after checkout repo is a workaround for