chore: revert #265 (#267)

(cherry picked from commit bd0c969) # Conflicts: # .github/workflows/docker-publish.yaml # .github/workflows/draft-release.yaml # .github/workflows/e2e-tests.yaml # .github/workflows/simulation-tests.yaml # .github/workflows/unit-tests.yaml
noble-assets · Nov 14, 2023 · 5c7d856 · 5c7d856
1 parent 7b80e12
commit 5c7d856
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 32 deletions.
diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
@@ -3,7 +3,7 @@ name: Create and Push Docker Image
 on:
   push:
     branches:
-    - '**'
+      - '**'
 
 env:
   REGISTRY: ghcr.io
@@ -33,6 +33,7 @@ jobs:
           chain: noble
           dockerfile: cosmos
           build-target: make install
+<<<<<<< HEAD
           build-env: |
             - GOPRIVATE=github.com/circlefin/noble-cctp
           pre-build: |
@@ -42,5 +43,7 @@ jobs:
             apk add openssh
             git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
             ssh-keyscan github.com >> ~/.ssh/known_hosts
+=======
+>>>>>>> bd0c969 (chore: revert #265 (#267))
           binaries: |
             - /go/bin/nobled
diff --git a/.github/workflows/draft-release.yaml b/.github/workflows/draft-release.yaml
@@ -3,7 +3,7 @@ name: Create and Push Docker Image
 on:
   push:
     tags:
-    - '**'
+      - '**'
 
 env:
   REGISTRY: ghcr.io
@@ -33,6 +33,7 @@ jobs:
           chain: noble
           dockerfile: cosmos
           build-target: make install
+<<<<<<< HEAD
           build-env: |
             - GOPRIVATE=github.com/circlefin/noble-cctp
           pre-build: |
@@ -42,27 +43,29 @@ jobs:
             apk add openssh
             git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
             ssh-keyscan github.com >> ~/.ssh/known_hosts
+=======
+>>>>>>> bd0c969 (chore: revert #265 (#267))
           binaries: |
             - /go/bin/nobled
   
   draft-release:
     needs: build-and-push-image
     runs-on: ubuntu-latest
     steps:
-    - name: Copy Binary
-      run: |
-        docker create -it --entrypoint sh --name amd --platform linux/amd64 ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.ref_name }}
-        docker create -it --entrypoint sh --name arm --platform linux/arm64 ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.ref_name }}
-        docker cp amd:/bin/nobled ./nobled_linux-amd64
-        docker cp arm:/bin/nobled ./nobled_linux-arm64
-        sha256sum ./nobled_linux-amd64 > ./nobled_sha256.txt
-        sha256sum ./nobled_linux-arm64 >> ./nobled_sha256.txt
-    
-    - name: Draft Release
-      uses: softprops/action-gh-release@v1        
-      with:
-        draft: true
-        files: |
-          nobled_linux-amd64
-          nobled_linux-arm64
-          nobled_sha256.txt
+      - name: Copy Binary
+        run: |
+          docker create -it --entrypoint sh --name amd --platform linux/amd64 ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.ref_name }}
+          docker create -it --entrypoint sh --name arm --platform linux/arm64 ${{ env.REGISTRY }}/${{ github.repository }}:${{ github.ref_name }}
+          docker cp amd:/bin/nobled ./nobled_linux-amd64
+          docker cp arm:/bin/nobled ./nobled_linux-arm64
+          sha256sum ./nobled_linux-amd64 > ./nobled_sha256.txt
+          sha256sum ./nobled_linux-arm64 >> ./nobled_sha256.txt
+
+      - name: Draft Release
+        uses: softprops/action-gh-release@v1
+        with:
+          draft: true
+          files: |
+            nobled_linux-amd64
+            nobled_linux-arm64
+            nobled_sha256.txt
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -27,6 +27,7 @@ jobs:
           chain: noble
           dockerfile: cosmos
           build-target: make install
+<<<<<<< HEAD
           build-env: |
             - GOPRIVATE=github.com/circlefin/noble-cctp
           pre-build: |
@@ -36,6 +37,8 @@ jobs:
             apk add openssh
             git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
             ssh-keyscan github.com >> ~/.ssh/known_hosts
+=======
+>>>>>>> bd0c969 (chore: revert #265 (#267))
           binaries: |
             - /go/bin/nobled
 
@@ -50,14 +53,15 @@ jobs:
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
 
-    - name: Set up Go 1.21
-      uses: actions/setup-go@v4
-      with:
-        go-version: '^1.21'
+      - name: Set up Go 1.21
+        uses: actions/setup-go@v4
+        with:
+          go-version: '^1.21'
 
+<<<<<<< HEAD
     - name: CCTP private repo auth
       run: |
         mkdir -p ~/.ssh
@@ -73,27 +77,36 @@ jobs:
         # Run the command and convert its output to a JSON array
         TESTS=$(cd interchaintest && go test -list . | grep -v "^ok " | jq -R -s -c 'split("\n")[:-1]')
         echo "matrix=${TESTS}" >> $GITHUB_OUTPUT
+=======
+      - name: Generate matrix
+        id: set-matrix
+        run: |
+          # Run the command and convert its output to a JSON array
+          TESTS=$(cd interchaintest && go test -list . | grep -v "^ok " | jq -R -s -c 'split("\n")[:-1]')
+          echo "matrix=${TESTS}" >> $GITHUB_OUTPUT
+>>>>>>> bd0c969 (chore: revert #265 (#267))
 
   e2e-tests:
-    needs: 
+    needs:
       - build-docker
       - prepare-e2e-tests
     runs-on: ubuntu-latest
     strategy:
-        matrix:
-            # names of `make` commands to run tests
-          test: ${{fromJson(needs.prepare-e2e-tests.outputs.matrix)}}
-        fail-fast: false
+      matrix:
+        # names of `make` commands to run tests
+        test: ${{fromJson(needs.prepare-e2e-tests.outputs.matrix)}}
+      fail-fast: false
 
     steps:
       - name: Set up Go 1.21
         uses: actions/setup-go@v4
         with:
           go-version: '^1.21'
-              
+
       - name: checkout chain
         uses: actions/checkout@v4
 
+<<<<<<< HEAD
       - name: CCTP private repo auth
         run: |
           mkdir -p ~/.ssh
@@ -103,6 +116,8 @@ jobs:
           export GOPRIVATE=github.com/circlefin/noble-cctp
           git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
 
+=======
+>>>>>>> bd0c969 (chore: revert #265 (#267))
       - name: Download Tarball Artifact
         uses: actions/download-artifact@v3
         with:

diff --git a/.github/workflows/simulation-tests.yaml b/.github/workflows/simulation-tests.yaml
@@ -15,6 +15,7 @@ jobs:
         with:
           go-version: 1.21
 
+<<<<<<< HEAD
       - name: Setup SSH
         run: |
           mkdir -p ~/.ssh
@@ -24,5 +25,7 @@ jobs:
           export GOPRIVATE=github.com/circlefin/noble-cctp
           git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
 
+=======
+>>>>>>> bd0c969 (chore: revert #265 (#267))
       - name: Run Unit Tests
         run: go test -bench BenchmarkSimulation ./app
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -15,6 +15,7 @@ jobs:
         with:
           go-version: ^1.21
 
+<<<<<<< HEAD
       - name: CCTP private repo auth
         run: |
           mkdir -p ~/.ssh
@@ -24,5 +25,7 @@ jobs:
           export GOPRIVATE=github.com/circlefin/noble-cctp
           git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
 
+=======
+>>>>>>> bd0c969 (chore: revert #265 (#267))
       - name: Run Unit Tests
-        run: go test -v ./...
+        run: go test -v ./...