From 51ba92e83c78f7ec0f7ac89270e3237cea61b53a Mon Sep 17 00:00:00 2001 From: maancham Date: Tue, 8 Oct 2024 17:15:52 -0400 Subject: [PATCH 1/2] fix(ci): set upload action package version to 1.3.2 --- .github/workflows/build-binaries-and-push-to-r2.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-binaries-and-push-to-r2.yaml b/.github/workflows/build-binaries-and-push-to-r2.yaml index b9d8e8c2c..02bc38e64 100644 --- a/.github/workflows/build-binaries-and-push-to-r2.yaml +++ b/.github/workflows/build-binaries-and-push-to-r2.yaml @@ -55,7 +55,7 @@ jobs: - name: List contents of root directory run: ls -la - - uses: ryand56/r2-upload-action@latest + - uses: ryand56/r2-upload-action@v1.3.2 with: r2-account-id: ${{ secrets.R2_ACCOUNT_ID }} r2-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID_CF }} From 5097d539d31e7cf3b482f4bf60250614e0e3c307 Mon Sep 17 00:00:00 2001 From: maancham Date: Tue, 8 Oct 2024 17:21:58 -0400 Subject: [PATCH 2/2] refactor: naming convetions --- .../build-binaries-and-push-to-r2.yaml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-binaries-and-push-to-r2.yaml b/.github/workflows/build-binaries-and-push-to-r2.yaml index 02bc38e64..aba42fc66 100644 --- a/.github/workflows/build-binaries-and-push-to-r2.yaml +++ b/.github/workflows/build-binaries-and-push-to-r2.yaml @@ -7,7 +7,7 @@ on: workflow_dispatch: inputs: branch: - description: Github branch to checkout for build + description: Github branch or tag to checkout for compilation required: true default: main type: string @@ -21,15 +21,15 @@ jobs: packages: write id-token: write steps: - - name: Determine branch - id: get-branch-name + - name: Determine checkout ref + id: get-checkout-ref run: | if [ "${{ github.event_name }}" == "push" ]; then - branch="main" + ref="main" else - branch="${{ inputs.branch }}" + ref="${{ inputs.branch }}" fi - echo "branch=$branch" >> $GITHUB_OUTPUT + echo "ref=$ref" >> $GITHUB_OUTPUT - name: Checkout code uses: actions/checkout@v4 @@ -37,7 +37,7 @@ jobs: fetch-depth: "0" path: axelar-core submodules: recursive - ref: ${{ steps.get-branch-name.outputs.branch }} + ref: ${{ steps.get-checkout-ref.outputs.ref }} - name: Build axelard binary with version and commit hash id: build-binary @@ -52,9 +52,6 @@ jobs: sudo mv axelar-core/bin/axelard ./$commit_hash/axelard-linux-amd64-$semver echo "binary-directory=./$commit_hash" >> $GITHUB_OUTPUT - - name: List contents of root directory - run: ls -la - - uses: ryand56/r2-upload-action@v1.3.2 with: r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}