v7 pre-Axelar

.github/workflows/integration-tests.yml

@@ -18,8 +18,12 @@ jobs:
     permissions:
       contents: read
       packages: write
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-20.04
     steps:
+      - name: Set up Go 1.18
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.18
       - name: checkout
         uses: actions/checkout@v2
       - name: Set up Docker Buildx
@@ -64,7 +68,7 @@ jobs:
     permissions:
       contents: write
       packages: write
-    runs-on: [self-hosted, linux]
+    runs-on: ubuntu-20.04
     steps:
       - name: checkout
         uses: actions/checkout@v2
@@ -108,18 +112,23 @@ jobs:
 
   integration-tests:
     environment: CI
-    runs-on: [self-hosted, linux]
-    needs: [sommelier-build, hardhat-build]
+    runs-on: ubuntu-20.04
+    needs: [ sommelier-build, hardhat-build ]
     strategy:
       fail-fast: false
       matrix:
-        test_type: ["ScheduledCork", "AuctionModule", "CellarFees", "Incentives"]
+        test_type: [
+          "Cork",
+          "ScheduledCork",
+          "AuctionModule",
+          "CellarFees",
+          "Incentives",
+        ]
     steps:
-      # Not needed on self hosted test runner that already has go installed
-      #       - name: Set up Go 1.16
-      #         uses: actions/setup-go@v2
-      #         with:
-      #           go-version: ^1.16
+      - name: Set up Go 1.18
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.18
       - name: checkout
         uses: actions/checkout@v2
       - name: go-cache
@@ -166,4 +175,9 @@ jobs:
       - name: Run end to end test
         run: ./integration_tests/integration_tests.test -test.failfast -test.v -test.run IntegrationTestSuite -testify.m Test${{ matrix.test_type }}
         env:
+          E2E_SKIP_CLEANUP: true
           ARCHIVE_NODE_URL: ${{ secrets.ARCHIVE_NODE_URL }}
+      - name: Clean up docker images
+        run: ./clean_slate.sh
+      - name: Remove testnet tempdir
+        run: sudo rm -rf somm-e2e-testnet*

.github/workflows/lint.yml

@@ -10,12 +10,12 @@ on:
 jobs:
   golangci:
     name: golangci-lint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     timeout-minutes: 6
     steps:
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
-          go-version: 1.15
+          go-version: 1.18
       - uses: actions/checkout@v2
       - uses: technote-space/get-diff-action@v4
         with:
@@ -26,8 +26,7 @@ jobs:
       - uses: golangci/golangci-lint-action@v3
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.37
-          skip-go-installation: true
+          version: v1.47
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}
         if: env.GIT_DIFF

.github/workflows/release.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   goreleaser:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2.3.4
@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.16'
+          go-version: '1.18'
 
       - run: echo ":rocket::rocket::rocket:" > ../release_notes.md 
         if: startsWith(github.ref, 'refs/tags/')

.github/workflows/unit-test.yml

@@ -12,7 +12,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.16]
+        go-version: [1.18]
         os: [ubuntu-latest]
     runs-on: ubuntu-latest
     steps:

Makefile

@@ -351,7 +351,7 @@ tools-clean:
 # Integration tests #
 #####################
 
-ORCHESTRATOR_IMAGE := "ghcr.io/peggyjv/gravity-bridge-orchestrator:main"
+ORCHESTRATOR_IMAGE := "ghcr.io/peggyjv/gravity-bridge-orchestrator:v2.0.4"
 
 e2e_build_images: e2e_clean_slate
 	@docker pull $(ORCHESTRATOR_IMAGE)
@@ -360,22 +360,7 @@ e2e_build_images: e2e_clean_slate
 	@docker build -t ethereum:prebuilt -f integration_tests/ethereum/Dockerfile integration_tests/ethereum/
 
 e2e_clean_slate:
-	@docker rm --force \
-		$(shell docker ps -qa --filter="name=ethereum") \
-		$(shell docker ps -qa --filter="name=sommelier") \
-		$(shell docker ps -qa --filter="name=orchestrator") \
-		1>/dev/null \
-		2>/dev/null \
-		|| true
-	@docker wait \
-		$(shell docker ps -qa --filter="name=ethereum") \
-		$(shell docker ps -qa --filter="name=sommelier") \
-		$(shell docker ps -qa --filter="name=orchestrator") \
-		1>/dev/null \
-		2>/dev/null \
-		|| true
-	@docker network prune --force 1>/dev/null 2>/dev/null || true
-	@cd integration_tests && go test -c
+	@./clean_slate.sh
 
 e2e_basic: e2e_clean_slate
 	@integration_tests/integration_tests.test -test.run TestBasicChain -test.failfast -test.v || make -s fail