From d490f4dcb17e8b5e0c6d804db7b47c28fb1225f4 Mon Sep 17 00:00:00 2001 From: CharlieM <31941002+CharlieMc0@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:39:56 -0400 Subject: [PATCH 1/7] Testing unused creds in CI --- .github/workflows/build.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d363e083d..63bf225d69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,10 +59,10 @@ jobs: skip_aws_cli: "true" skip_docker_compose: "true" - - name: setup-git-credentials - uses: de-vri-es/setup-git-credentials@v2.0.8 - with: - credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} + # - name: setup-git-credentials + # uses: de-vri-es/setup-git-credentials@v2.0.8 + # with: + # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - name: Test uses: nick-fields/retry@v2 @@ -128,10 +128,10 @@ jobs: skip_aws_cli: "true" skip_docker_compose: "true" - - name: setup-git-credentials - uses: de-vri-es/setup-git-credentials@v2.0.8 - with: - credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} + # - name: setup-git-credentials + # uses: de-vri-es/setup-git-credentials@v2.0.8 + # with: + # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} # - uses: buildjet/cache # timeout-minutes: 5 @@ -235,10 +235,10 @@ jobs: git shell-name: alpine.sh - - name: setup-git-credentials - uses: de-vri-es/setup-git-credentials@v2.0.8 - with: - credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} + # - name: setup-git-credentials + # uses: de-vri-es/setup-git-credentials@v2.0.8 + # with: + # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} # - name: Test # shell: alpine.sh --root {0} From fd84246d03d82a0aa156a65afe0c52d528521af3 Mon Sep 17 00:00:00 2001 From: CharlieM <31941002+CharlieMc0@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:43:28 -0400 Subject: [PATCH 2/7] testing removal from linters --- .github/workflows/gosec.yml | 8 ++++---- .github/workflows/linter.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml index 8195f53a5d..0277fea4df 100644 --- a/.github/workflows/gosec.yml +++ b/.github/workflows/gosec.yml @@ -20,10 +20,10 @@ jobs: with: fetch-depth: 0 - - name: setup-git-credentials - uses: de-vri-es/setup-git-credentials@v2.0.8 - with: - credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} + # - name: setup-git-credentials + # uses: de-vri-es/setup-git-credentials@v2.0.8 + # with: + # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - name: Set up Go diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 6e79fea33a..87781cd21e 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -26,10 +26,10 @@ jobs: # - name: Install Pipeline Dependencies # uses: ./.github/actions/install-dependencies - - name: setup-git-credentials - uses: de-vri-es/setup-git-credentials@v2.0.8 - with: - credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} + # - name: setup-git-credentials + # uses: de-vri-es/setup-git-credentials@v2.0.8 + # with: + # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - name: Set up Go uses: actions/setup-go@v3 From 64b646293316c48f300682685a642865a04784f3 Mon Sep 17 00:00:00 2001 From: CharlieM <31941002+CharlieMc0@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:53:11 -0400 Subject: [PATCH 3/7] testing whole workflow --- .github/workflows/build.yml | 71 ++++++++++---------------- .github/workflows/chain-operations.yml | 8 +-- .github/workflows/deploy.yml | 8 +-- .github/workflows/gosec.yml | 6 --- 4 files changed, 35 insertions(+), 58 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63bf225d69..9543a75b12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,7 @@ jobs: runs-on: ubuntu-latest # runs-on: ["zeta-runners"] timeout-minutes: 20 - if: (! startsWith(github.ref, 'refs/tags/')) || (! startsWith(github.ref, 'refs/heads/develop') ) + # if: (! startsWith(github.ref, 'refs/tags/')) || (! startsWith(github.ref, 'refs/heads/develop') ) concurrency: group: "build-and-test-single-arch" steps: @@ -58,11 +58,6 @@ jobs: skip_python: "true" skip_aws_cli: "true" skip_docker_compose: "true" - - # - name: setup-git-credentials - # uses: de-vri-es/setup-git-credentials@v2.0.8 - # with: - # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - name: Test uses: nick-fields/retry@v2 @@ -128,11 +123,6 @@ jobs: skip_aws_cli: "true" skip_docker_compose: "true" - # - name: setup-git-credentials - # uses: de-vri-es/setup-git-credentials@v2.0.8 - # with: - # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - # - uses: buildjet/cache # timeout-minutes: 5 # with: @@ -192,7 +182,7 @@ jobs: build-alpine-and-test: runs-on: ["ubuntu-latest"] timeout-minutes: 30 - if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') + # if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') concurrency: group: "alpine-build-test" steps: @@ -240,14 +230,6 @@ jobs: # with: # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - # - name: Test - # shell: alpine.sh --root {0} - # run: | - # echo "Running Build Tests" - # apk add --no-cache --update - # make clean - # make test - - name: Test uses: nick-fields/retry@v2 with: @@ -363,7 +345,7 @@ jobs: #runs-on: ubuntu-latest timeout-minutes: 15 - if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') + # if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') needs: - build-and-test-multi-arch - smoke-test @@ -371,10 +353,11 @@ jobs: steps: - uses: actions/checkout@v3 - - name: setup-git-credentials - uses: de-vri-es/setup-git-credentials@v2.0.8 - with: - credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} + # This can probably be removed now - Aug 2023 + # - name: setup-git-credentials + # uses: de-vri-es/setup-git-credentials@v2.0.8 + # with: + # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - name: Install Pipeline Dependencies uses: ./.github/actions/install-dependencies @@ -480,7 +463,7 @@ jobs: upgrade_path_testing: runs-on: ["buildjet-4vcpu-ubuntu-2204"] timeout-minutes: 60 - if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release') + # if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release') needs: - build-and-test-multi-arch - build-alpine-and-test @@ -512,17 +495,17 @@ jobs: #runs-on: ubuntu-latest runs-on: ["zeta-runners"] timeout-minutes: 15 - if: startsWith(github.ref, 'refs/tags/') + # if: startsWith(github.ref, 'refs/tags/') needs: - upgrade_path_testing steps: - uses: actions/checkout@v3 - - name: setup-git-credentials - uses: de-vri-es/setup-git-credentials@v2.0.8 - with: - credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} + # - name: setup-git-credentials + # uses: de-vri-es/setup-git-credentials@v2.0.8 + # with: + # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - name: Install Pipeline Dependencies uses: ./.github/actions/install-dependencies @@ -577,20 +560,20 @@ jobs: fi id: determine_release_type - - name: "SEND:DISCORD:MESSAGE" - if: steps.determine_release_type.outputs.RELEASE_TYPE == 'major' - uses: gzukel/CosmosComposites/send_discord_message@main - with: - discord_token: "${{ secrets.DISCORD_TOKEN }}" - discord_channel_id: "${{ secrets.DISCORD_CHANNEL_ID }}" - discord_message: | - Hey <@&1122981184255840306>! A new version of the zetachain node has been released. - - Major Version Upgrade (e.g. v5.x.x to V6.x.x) must be completed through a governance proposal. - We will submit a governance proposal in the next few days with a 12-hour voting period. - More specific information including block height will be shared as part of the governance proposal. + # - name: "SEND:DISCORD:MESSAGE" + # if: steps.determine_release_type.outputs.RELEASE_TYPE == 'major' + # uses: gzukel/CosmosComposites/send_discord_message@main + # with: + # discord_token: "${{ secrets.DISCORD_TOKEN }}" + # discord_channel_id: "${{ secrets.DISCORD_CHANNEL_ID }}" + # discord_message: | + # Hey <@&1122981184255840306>! A new version of the zetachain software has been released. + + # Major Version Upgrade (e.g. v5.x.x to V6.x.x) must be completed through a governance proposal. + # We will submit a governance proposal in the next few days. + # More specific information including block height will be shared as part of the governance proposal. - See the release notes for more details. https://github.com/zeta-chain/node/releases/tag/${{ env.BINARY_VERSION }} + # See the release notes for more details. https://github.com/zeta-chain/node/releases/tag/${{ env.BINARY_VERSION }} # - name: "SEND:DISCORD:MESSAGE" # if: steps.determine_release_type.outputs.RELEASE_TYPE == 'minor' diff --git a/.github/workflows/chain-operations.yml b/.github/workflows/chain-operations.yml index 2c9e360698..53dd15fb81 100644 --- a/.github/workflows/chain-operations.yml +++ b/.github/workflows/chain-operations.yml @@ -36,10 +36,10 @@ jobs: - name: Install Pipeline Dependencies uses: ./.github/actions/install-dependencies - - name: setup-git-credentials - uses: de-vri-es/setup-git-credentials@v2.0.8 - with: - credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} + # - name: setup-git-credentials + # uses: de-vri-es/setup-git-credentials@v2.0.8 + # with: + # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 40816a122d..e5f234ca6e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -32,10 +32,10 @@ jobs: - name: Install Pipeline Dependencies uses: ./.github/actions/install-dependencies - - name: setup-git-credentials - uses: de-vri-es/setup-git-credentials@v2.0.8 - with: - credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} + # - name: setup-git-credentials + # uses: de-vri-es/setup-git-credentials@v2.0.8 + # with: + # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 diff --git a/.github/workflows/gosec.yml b/.github/workflows/gosec.yml index 0277fea4df..dd4791f507 100644 --- a/.github/workflows/gosec.yml +++ b/.github/workflows/gosec.yml @@ -20,12 +20,6 @@ jobs: with: fetch-depth: 0 - # - name: setup-git-credentials - # uses: de-vri-es/setup-git-credentials@v2.0.8 - # with: - # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - - - name: Set up Go uses: actions/setup-go@v2 with: From 442c897b6a9663760c96945e73361d46e5e2f0b2 Mon Sep 17 00:00:00 2001 From: CharlieM <31941002+CharlieMc0@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:58:30 -0400 Subject: [PATCH 4/7] testing whole workflow --- .github/workflows/build.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9543a75b12..3a8753ba2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -231,16 +231,15 @@ jobs: # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - name: Test - uses: nick-fields/retry@v2 - with: - timeout_minutes: 20 - max_attempts: 2 - retry_on: error - shell: alpine.sh --root {0} - command: | - echo "Running Build Tests" - make clean - make test + env: + CGO_ENABLED: 1 + GOOS: linux + GOARCH: ${{ env.CPU_ARCH }} + shell: alpine.sh --root {0} + run: | + echo "Running Build Tests" + make clean + make test - name: Build zetacored and zetaclientd env: From bef7d36e9ac0d0d88c79adeb979327bbf3ddaea1 Mon Sep 17 00:00:00 2001 From: CharlieM <31941002+CharlieMc0@users.noreply.github.com> Date: Wed, 9 Aug 2023 09:58:55 -0400 Subject: [PATCH 5/7] testing whole workflow --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3a8753ba2a..16742ac5c9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -98,7 +98,7 @@ jobs: runs-on: ${{matrix.runs-on}} timeout-minutes: 30 - if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') + # if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') steps: - uses: actions/checkout@v3 From ad4edb7552da5e481d4fdde73ed72cc7e8623c83 Mon Sep 17 00:00:00 2001 From: CharlieM <31941002+CharlieMc0@users.noreply.github.com> Date: Wed, 9 Aug 2023 10:22:08 -0400 Subject: [PATCH 6/7] cleaned up from testing --- .github/workflows/build.yml | 53 +++++++++----------------- .github/workflows/chain-operations.yml | 5 --- 2 files changed, 18 insertions(+), 40 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 16742ac5c9..3cb09ff46b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,7 +32,6 @@ jobs: runs-on: ubuntu-latest # runs-on: ["zeta-runners"] timeout-minutes: 20 - # if: (! startsWith(github.ref, 'refs/tags/')) || (! startsWith(github.ref, 'refs/heads/develop') ) concurrency: group: "build-and-test-single-arch" steps: @@ -98,7 +97,7 @@ jobs: runs-on: ${{matrix.runs-on}} timeout-minutes: 30 - # if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') + if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') steps: - uses: actions/checkout@v3 @@ -182,7 +181,7 @@ jobs: build-alpine-and-test: runs-on: ["ubuntu-latest"] timeout-minutes: 30 - # if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') + if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') concurrency: group: "alpine-build-test" steps: @@ -225,11 +224,6 @@ jobs: git shell-name: alpine.sh - # - name: setup-git-credentials - # uses: de-vri-es/setup-git-credentials@v2.0.8 - # with: - # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - - name: Test env: CGO_ENABLED: 1 @@ -344,7 +338,7 @@ jobs: #runs-on: ubuntu-latest timeout-minutes: 15 - # if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') + if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/develop') needs: - build-and-test-multi-arch - smoke-test @@ -352,12 +346,6 @@ jobs: steps: - uses: actions/checkout@v3 - # This can probably be removed now - Aug 2023 - # - name: setup-git-credentials - # uses: de-vri-es/setup-git-credentials@v2.0.8 - # with: - # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - - name: Install Pipeline Dependencies uses: ./.github/actions/install-dependencies timeout-minutes: 8 @@ -462,7 +450,7 @@ jobs: upgrade_path_testing: runs-on: ["buildjet-4vcpu-ubuntu-2204"] timeout-minutes: 60 - # if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release') + if: startsWith(github.ref, 'refs/tags/') || startsWith(github.ref, 'refs/heads/release') needs: - build-and-test-multi-arch - build-alpine-and-test @@ -494,18 +482,13 @@ jobs: #runs-on: ubuntu-latest runs-on: ["zeta-runners"] timeout-minutes: 15 - # if: startsWith(github.ref, 'refs/tags/') + if: startsWith(github.ref, 'refs/tags/') needs: - upgrade_path_testing steps: - uses: actions/checkout@v3 - # - name: setup-git-credentials - # uses: de-vri-es/setup-git-credentials@v2.0.8 - # with: - # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - - name: Install Pipeline Dependencies uses: ./.github/actions/install-dependencies timeout-minutes: 8 @@ -559,20 +542,20 @@ jobs: fi id: determine_release_type - # - name: "SEND:DISCORD:MESSAGE" - # if: steps.determine_release_type.outputs.RELEASE_TYPE == 'major' - # uses: gzukel/CosmosComposites/send_discord_message@main - # with: - # discord_token: "${{ secrets.DISCORD_TOKEN }}" - # discord_channel_id: "${{ secrets.DISCORD_CHANNEL_ID }}" - # discord_message: | - # Hey <@&1122981184255840306>! A new version of the zetachain software has been released. - - # Major Version Upgrade (e.g. v5.x.x to V6.x.x) must be completed through a governance proposal. - # We will submit a governance proposal in the next few days. - # More specific information including block height will be shared as part of the governance proposal. + - name: "SEND:DISCORD:MESSAGE" + if: steps.determine_release_type.outputs.RELEASE_TYPE == 'major' + uses: gzukel/CosmosComposites/send_discord_message@main + with: + discord_token: "${{ secrets.DISCORD_TOKEN }}" + discord_channel_id: "${{ secrets.DISCORD_CHANNEL_ID }}" + discord_message: | + Hey <@&1122981184255840306>! A new version of the zetachain software has been released. + + Major Version Upgrade (e.g. v5.x.x to V6.x.x) must be completed through a governance proposal. + We will submit a governance proposal in the next few days. + More specific information including block height will be shared as part of the governance proposal. - # See the release notes for more details. https://github.com/zeta-chain/node/releases/tag/${{ env.BINARY_VERSION }} + See the release notes for more details. https://github.com/zeta-chain/node/releases/tag/${{ env.BINARY_VERSION }} # - name: "SEND:DISCORD:MESSAGE" # if: steps.determine_release_type.outputs.RELEASE_TYPE == 'minor' diff --git a/.github/workflows/chain-operations.yml b/.github/workflows/chain-operations.yml index 53dd15fb81..88bd4c06c6 100644 --- a/.github/workflows/chain-operations.yml +++ b/.github/workflows/chain-operations.yml @@ -35,11 +35,6 @@ jobs: - name: Install Pipeline Dependencies uses: ./.github/actions/install-dependencies - - # - name: setup-git-credentials - # uses: de-vri-es/setup-git-credentials@v2.0.8 - # with: - # credentials: ${{ secrets.PAT_GITHUB_SERVICE_ACCT }} - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 From 75db596e612fb2520977316d91659c641bb58217 Mon Sep 17 00:00:00 2001 From: CharlieM <31941002+CharlieMc0@users.noreply.github.com> Date: Wed, 9 Aug 2023 10:24:24 -0400 Subject: [PATCH 7/7] cleaned up from testing --- .github/workflows/build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3cb09ff46b..6c095021f7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,7 @@ jobs: runs-on: ubuntu-latest # runs-on: ["zeta-runners"] timeout-minutes: 20 + if: (! startsWith(github.ref, 'refs/tags/')) || (! startsWith(github.ref, 'refs/heads/develop') ) concurrency: group: "build-and-test-single-arch" steps: @@ -231,9 +232,10 @@ jobs: GOARCH: ${{ env.CPU_ARCH }} shell: alpine.sh --root {0} run: | - echo "Running Build Tests" - make clean - make test + echo "Running Build Tests" + apk add --no-cache --update + make clean + make test - name: Build zetacored and zetaclientd env: @@ -549,7 +551,7 @@ jobs: discord_token: "${{ secrets.DISCORD_TOKEN }}" discord_channel_id: "${{ secrets.DISCORD_CHANNEL_ID }}" discord_message: | - Hey <@&1122981184255840306>! A new version of the zetachain software has been released. + Hey <@&1122981184255840306>! A new version of the ZetaChain software has been released. Major Version Upgrade (e.g. v5.x.x to V6.x.x) must be completed through a governance proposal. We will submit a governance proposal in the next few days.