Merge remote-tracking branch 'origin/develop' into dht-removal

zeta-chain · Nov 4, 2024 · b79af05 · b79af05
2 parents ab06660 + 44c377a
commit b79af05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -96,6 +96,9 @@ jobs:
   rpcimportable:
     runs-on: ubuntu-20.04
     timeout-minutes: 15
+    # do not run this on forks as they are not installable
+    # it will still be check in the merge queue in this case
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'zeta-chain/node'
     steps:
       - uses: actions/checkout@v4
       - name: Set up Go

diff --git a/.github/workflows/reusable-e2e.yml b/.github/workflows/reusable-e2e.yml
@@ -40,7 +40,7 @@ jobs:
 
       - name: Login to Docker Hub registry
         uses: docker/login-action@v3
-        if: (github.event_name == 'push' && github.repository == 'zeta-chain/node') || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'zeta-chain/node')
+        if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'zeta-chain/node'
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_READ_ONLY }}