Merge branch 'main' into murali/ibc-denom

cosmos · Sep 11, 2023 · ec3d294 · ec3d294
2 parents b22484a + 66ec1dd
commit ec3d294
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 28 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -28,7 +28,7 @@ jobs:
         images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME }}
 
     - name: Build Docker image
-      uses: docker/build-push-action@4e4ee680f69700760d5620a94c020aef883043aa
+      uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9
       with:
         context: .
         tags: ${{ steps.meta.outputs.tags }}
@@ -46,7 +46,7 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Push Docker image
-      uses: docker/build-push-action@4e4ee680f69700760d5620a94c020aef883043aa
+      uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9
       with:
         context: .
         push: true

diff --git a/.github/workflows/e2e-test-workflow-call.yml b/.github/workflows/e2e-test-workflow-call.yml
@@ -47,6 +47,11 @@ on:
         description: 'The upgrade plan name'
         required: false
         type: string
+      relayer-image:
+        description: 'The image to use for the relayer'
+        required: false
+        default: '' # the tests themselves will choose a sensible default when unset.
+        type: string
       relayer-type:
         description: 'The type of relayer to use'
         required: false
@@ -84,6 +89,7 @@ jobs:
           echo "Chain B Tag:       ${{ inputs.chain-b-tag }}"
           echo "Chain Upgrade Tag: ${{ inputs.chain-upgrade-tag }}"
           echo "Upgrade Plan Name: ${{ inputs.upgrade-plan-name }}"
+          echo "Relayer Image:"    ${{ inputs.relayer-image }}
           echo "Relayer Type:      ${{ inputs.relayer-type }}"
           echo "Relayer Tag:       ${{ inputs.relayer-tag }}"
           echo "Test Entry Point:  ${{ inputs.test-entry-point }}"
@@ -115,7 +121,7 @@ jobs:
 
       - name: Build and push Docker image
         if: ${{ inputs.build-and-push-docker-image }}
-        uses: docker/build-push-action@4e4ee680f69700760d5620a94c020aef883043aa
+        uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9
         with:
           context: .
           push: true
@@ -158,6 +164,7 @@ jobs:
       CHAIN_IMAGE: '${{ inputs.chain-image }}'
       CHAIN_A_TAG: '${{ inputs.chain-a-tag }}'
       CHAIN_B_TAG: '${{ inputs.chain-b-tag }}'
+      RELAYER_IMAGE: '${{ inputs.relayer-image }}'
       RELAYER_TAG: '${{ inputs.relayer-tag }}'
       RELAYER_TYPE: '${{ inputs.relayer-type }}'
       CHAIN_BINARY: '${{ inputs.chain-binary }}'

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -1,14 +1,8 @@
 # The Tests / E2E workflow is used to run end-to-end tests on pull requests originating
 # from the ibc-go repository. The workflow is triggered on a PR opening, when new commits
 # are pushed to the PR, or when the PR is marked ready for review.
-#
-# A scheduled job is also set up to run every night. This job is used to run e2e tests
-# using the hermes relayer.
 name: Tests / E2E
 on:
-  # This schedule is used solely for hermes and is set to run every night.
-  schedule:
-    - cron: '0 0 * * *'
   workflow_dispatch:
   pull_request:
     types:
@@ -31,9 +25,6 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       simd-tag: ${{ steps.get-tag.outputs.simd-tag }}
-      # Temporarily, see: https://github.com/cosmos/ibc-go/issues/3981
-      relayer: ${{ steps.get-relayer.outputs.relayer }}
-      relayer-tag: ${{ steps.get-relayer.outputs.relayer-tag }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
@@ -49,18 +40,6 @@ jobs:
             echo "Using tag $tag"
             echo "simd-tag=$tag" >> $GITHUB_OUTPUT
           fi
-      # get-relayer will return either hermes or rly depending on whether the workflow was triggered
-      # by a scheduled run or not.
-      - id: get-relayer
-        run: |
-          if [ "${{ github.event_name }}" == "schedule" ]
-          then
-            echo "relayer=rly" >> $GITHUB_OUTPUT
-            echo "relayer-tag=colin-event-fix" >> $GITHUB_OUTPUT
-          else
-            echo "relayer=hermes" >> $GITHUB_OUTPUT
-            echo "relayer-tag=v1.6.0" >> $GITHUB_OUTPUT
-          fi
   # build-e2e ensures that all test code compiles.
   build-e2e:
     if: ${{ !github.event.pull_request.draft && !github.event.pull_request.head.repo.fork && github.actor != 'dependabot[bot]' }}
@@ -105,6 +84,3 @@ jobs:
       chain-binary: 'simd'
       # on regular PRs we won't run interchain account or upgrade tests.
       test-exclusions: 'TestInterTxTestSuite,TestIncentivizedInterTxTestSuite,TestUpgradeTestSuite'
-      # Temporarily, see: https://github.com/cosmos/ibc-go/issues/3981
-      relayer-type: '${{ needs.determine-image-tag.outputs.relayer }}'
-      relayer-tag: '${{ needs.determine-image-tag.outputs.relayer-tag }}'
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
           images: ${{ env.REGISTRY }}/cosmos/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@4e4ee680f69700760d5620a94c020aef883043aa
+        uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9
         with:
           context: .
           push: true