Merge branch 'develop' into fix/disable-vesting

zeta-chain · Aug 9, 2023 · 4ba5b46 · 4ba5b46
2 parents d6be740 + b7dfadf
commit 4ba5b46
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 61 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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:
@@ -235,28 +225,15 @@ 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
-      #   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:
-          timeout_minutes: 20
-          max_attempts: 2
-          retry_on: error
-          shell: alpine.sh --root {0}
-          command: |
+        env:
+          CGO_ENABLED: 1
+          GOOS: linux
+          GOARCH: ${{ env.CPU_ARCH }}
+        shell: alpine.sh --root {0}
+        run: |
             echo "Running Build Tests"
+            apk add --no-cache --update
             make clean
             make test
 
@@ -371,11 +348,6 @@ 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 }}
-
       - name: Install Pipeline Dependencies
         uses: ./.github/actions/install-dependencies
         timeout-minutes: 8
@@ -519,11 +491,6 @@ 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 }}
-
       - name: Install Pipeline Dependencies
         uses: ./.github/actions/install-dependencies
         timeout-minutes: 8
@@ -584,10 +551,10 @@ jobs:
           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. 
+            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 with a 12-hour voting period. 
+            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 }}

diff --git 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

diff --git 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
@@ -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:

diff --git 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