From de838c691026825ca15041b6711fb1e1207e44b4 Mon Sep 17 00:00:00 2001 From: Daniel Schiavini Date: Fri, 23 Feb 2024 16:00:58 +0100 Subject: [PATCH 1/3] Upgrade GitHub action dependencies --- .github/workflows/build.yml | 8 ++++---- .github/workflows/codeql.yml | 6 +++--- .github/workflows/era-tester.yml | 10 +++++----- .github/workflows/ghcr.yml | 8 ++++---- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 30 +++++++++++++++--------------- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8d7f7d6c4..659071ac25 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: fetch-depth: 0 - name: Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" cache: "pip" @@ -45,7 +45,7 @@ jobs: - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: dist/vyper.* @@ -61,7 +61,7 @@ jobs: fetch-depth: 0 - name: Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" cache: "pip" @@ -73,7 +73,7 @@ jobs: ./make.cmd freeze - name: Upload Artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: path: dist/vyper.* diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index eff72d61df..66d61b7f90 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -20,15 +20,15 @@ jobs: uses: actions/checkout@v3 - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: python queries: +security-and-quality - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 with: category: "/language:python" diff --git a/.github/workflows/era-tester.yml b/.github/workflows/era-tester.yml index 3e0bb3e941..19ebeb2733 100644 --- a/.github/workflows/era-tester.yml +++ b/.github/workflows/era-tester.yml @@ -27,22 +27,22 @@ jobs: echo "ERA_VYPER_HASH=$( curl -u "u:${{ github.token }}" https://api.github.com/repos/matter-labs/era-compiler-vyper/git/ref/heads/main | jq .object.sha | tr -d '"' )" >> $GITHUB_ENV - name: Checkout - uses: actions/checkout@v1 + uses: actions/checkout@v4 - name: Rust setup - uses: actions-rs/toolchain@v1 + uses: actions-rust-lang/setup-rust-toolchain@v1 with: toolchain: nightly-2022-11-03 - name: Set up Python ${{ matrix.python-version[0] }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version[0] }} cache: "pip" - name: Get cache id: get-cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: | ~/.cargo/bin/ @@ -70,7 +70,7 @@ jobs: cargo build --release - name: Save cache - uses: actions/cache/save@v3 + uses: actions/cache/save@v4 if: steps.get-cache.outputs.cache-hit != 'true' with: path: | diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml index a35a22e278..0f733a3f77 100644 --- a/.github/workflows/ghcr.yml +++ b/.github/workflows/ghcr.yml @@ -32,7 +32,7 @@ jobs: # need to fetch unshallow so that setuptools_scm can infer the version fetch-depth: 0 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 name: Install python with: python-version: "3.11" @@ -49,7 +49,7 @@ jobs: - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} tags: | @@ -60,14 +60,14 @@ jobs: - name: Login to ghcr.io - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: context: . push: true diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f268942e7d..d5ff85bb1a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v2 - name: Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8d23368eb0..0cd0e2b719 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,10 +15,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" cache: "pip" @@ -41,10 +41,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" cache: "pip" @@ -59,10 +59,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" cache: "pip" @@ -92,10 +92,10 @@ jobs: name: py${{ matrix.python-version[1] }}-opt-${{ matrix.opt-mode }}${{ matrix.debug && '-debug' || '' }} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version[0] }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version[0] }} cache: "pip" @@ -107,7 +107,7 @@ jobs: run: TOXENV=py${{ matrix.python-version[1] }} tox -r -- --optimize ${{ matrix.opt-mode }} ${{ matrix.debug && '--enable-compiler-debug-mode' || '' }} -r aR tests/ - name: Upload Coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} file: ./coverage.xml @@ -135,10 +135,10 @@ jobs: group: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" cache: "pip" @@ -156,7 +156,7 @@ jobs: run: TOXENV=fuzzing tox -r -- --splits 60 --group ${{ matrix.group }} --splitting-algorithm least_duration -r aR tests/ - name: Upload Coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} file: ./coverage.xml @@ -177,10 +177,10 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python 3.11 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.11" cache: "pip" @@ -192,7 +192,7 @@ jobs: run: TOXENV=memory tox -r - name: Upload Coverage - uses: codecov/codecov-action@v1 + uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} file: ./coverage.xml From cace5dd1b60d7310e6c115d11629cde06e60fbcd Mon Sep 17 00:00:00 2001 From: Daniel Schiavini Date: Wed, 28 Feb 2024 09:36:58 +0100 Subject: [PATCH 2/3] Artifact names --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 659071ac25..16c0ffac87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,6 +48,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: dist/vyper.* + name: vyper-${{ matrix.os }} windows-build: runs-on: windows-latest @@ -76,6 +77,7 @@ jobs: uses: actions/upload-artifact@v4 with: path: dist/vyper.* + name: vyper-windows publish-release-assets: needs: [windows-build, unix-build] From f1768bd427dbc041f2c103d1bd30e9aa7dde4871 Mon Sep 17 00:00:00 2001 From: Daniel Schiavini Date: Wed, 28 Feb 2024 10:19:33 +0100 Subject: [PATCH 3/3] More dependencies --- .github/workflows/build.yml | 9 +++++---- .github/workflows/codeql.yml | 2 +- .github/workflows/ghcr.yml | 2 +- .github/workflows/publish.yml | 2 +- .github/workflows/test.yml | 6 ++++++ 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16c0ffac87..bb4639c624 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: os: [ubuntu-20.04, macos-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # grab the commit passed in via `tag`, if any ref: ${{ github.event.inputs.tag }} @@ -54,7 +54,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: # grab the commit passed in via `tag`, if any ref: ${{ github.event.inputs.tag }} @@ -85,13 +85,14 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/download-artifact@v3 + - uses: actions/checkout@v4 + - uses: actions/download-artifact@v4 with: path: artifacts/ - name: Upload assets # fun - artifacts are downloaded into "artifact/". + # TODO: this needs to be tested since the upgrade to upload-artifact v4 working-directory: artifacts/artifact run: | set -Eeuxo pipefail diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 66d61b7f90..b4ff0ce791 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Initialize CodeQL uses: github/codeql-action/init@v3 diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml index 0f733a3f77..4827f4da24 100644 --- a/.github/workflows/ghcr.yml +++ b/.github/workflows/ghcr.yml @@ -27,7 +27,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: # need to fetch unshallow so that setuptools_scm can infer the version fetch-depth: 0 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d5ff85bb1a..0d68d1d7ee 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Python uses: actions/setup-python@v5 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0cd0e2b719..51b220e5a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -93,6 +93,9 @@ jobs: steps: - uses: actions/checkout@v4 + with: + # need to fetch unshallow so that setuptools_scm can infer the version + fetch-depth: 0 - name: Set up Python ${{ matrix.python-version[0] }} uses: actions/setup-python@v5 @@ -178,6 +181,9 @@ jobs: steps: - uses: actions/checkout@v4 + with: + # need to fetch unshallow so that setuptools_scm can infer the version + fetch-depth: 0 - name: Set up Python 3.11 uses: actions/setup-python@v5