From 9953189bcd7e825fac7c3fb589d0349e72bf59b6 Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Tue, 30 Nov 2021 09:41:07 -0500 Subject: [PATCH 1/2] Fix proxyd docker build workflow build_args --- .github/workflows/release.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 395b3a6ebb1a3..3aafc4db525d7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -184,9 +184,12 @@ jobs: username: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_USERNAME }} password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN_SECRET }} - - name: Set env + - name: Set build args + id: build_args run: | - echo "GITDATE=$(date)" >> $GITHUB_ENV" + echo ::set-output name=GITDATE::"$(date +%d-%m-%Y)" + echo ::set-output name=GITVERSION::$(jq -r .version ./go/proxyd/package.json) + echo ::set-output name=GITCOMMIT::"$GITHUB_SHA" - name: Build and push uses: docker/build-push-action@v2 @@ -196,8 +199,9 @@ jobs: push: true tags: ethereumoptimism/proxyd:${{ needs.release.outputs.proxyd }},ethereumoptimism/proxyd:latest build-args: | - GITCOMMIT=$GITHUB_SHA - GITDATE=$GITDATE + GITDATE=${{ steps.build_args.outputs.GITDATE }} + GITCOMMIT=${{ steps.build_args.outputs.GITCOMMIT }} + GITVERSION=${{ steps.build_args.outputs.GITVERSION }} rpc-proxy: name: Publish rpc-proxy Version ${{ needs.release.outputs.rpc-proxy }} From 34fcb2775faa5daf7727fcc893fc1aa26fc4622d Mon Sep 17 00:00:00 2001 From: Ben Wilson Date: Tue, 30 Nov 2021 09:43:11 -0500 Subject: [PATCH 2/2] Fixed proxyd release workflow --- .changeset/plenty-gifts-tell.md | 5 +++++ .github/workflows/release.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/plenty-gifts-tell.md diff --git a/.changeset/plenty-gifts-tell.md b/.changeset/plenty-gifts-tell.md new file mode 100644 index 0000000000000..00669c0642de4 --- /dev/null +++ b/.changeset/plenty-gifts-tell.md @@ -0,0 +1,5 @@ +--- +'@eth-optimism/proxyd': patch +--- + +Bump proxyd to test release build workflow diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3aafc4db525d7..e2c094fc0a3c3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -207,7 +207,7 @@ jobs: name: Publish rpc-proxy Version ${{ needs.release.outputs.rpc-proxy }} needs: release if: needs.release.outputs.rpc-proxy != '' - runs-on: ubuntu:latest + runs-on: ubuntu-latest steps: - name: Checkout