chore: another attempt

noble-assets · Oct 17, 2023 · 5fa6207 · 5fa6207
1 parent 33a993b
commit 5fa6207
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 36 deletions.
diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
@@ -34,15 +34,12 @@ jobs:
           dockerfile: cosmos
           build-target: make install
           build-env: |
-            - GOPRIVATE=github.com/circlefin/noble-cctp,github.com/noble-assets/cctp
+            - GOPRIVATE=github.com/noble-assets/cctp
           pre-build: |
             mkdir -p ~/.ssh
-            echo "${{ secrets.SSH_CIRCLE }}" | base64 -d > ~/.ssh/id_ed25519_circle
-            echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519_noble
-            chmod 600 ~/.ssh/id_ed25519_circle
-            chmod 600 ~/.ssh/id_ed25519_noble
+            echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519
+            chmod 600 ~/.ssh/id_ed25519
             apk add openssh
-            git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
             git config --global --add url."[email protected]:noble-assets/cctp.git".insteadOf "https://github.com/noble-assets/cctp"
             ssh-keyscan github.com >> ~/.ssh/known_hosts
           binaries: |

diff --git a/.github/workflows/draft-release.yaml b/.github/workflows/draft-release.yaml
@@ -34,15 +34,12 @@ jobs:
           dockerfile: cosmos
           build-target: make install
           build-env: |
-            - GOPRIVATE=github.com/circlefin/noble-cctp,github.com/noble-assets/cctp
+            - GOPRIVATE=github.com/noble-assets/cctp
           pre-build: |
             mkdir -p ~/.ssh
-            echo "${{ secrets.SSH_CIRCLE }}" | base64 -d > ~/.ssh/id_ed25519_circle
-            echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519_noble
-            chmod 600 ~/.ssh/id_ed25519_circle
-            chmod 600 ~/.ssh/id_ed25519_noble
+            echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519
+            chmod 600 ~/.ssh/id_ed25519
             apk add openssh
-            git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
             git config --global --add url."[email protected]:noble-assets/cctp.git".insteadOf "https://github.com/noble-assets/cctp"
             ssh-keyscan github.com >> ~/.ssh/known_hosts
           binaries: |

diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -28,15 +28,12 @@ jobs:
           dockerfile: cosmos
           build-target: make install
           build-env: |
-            - GOPRIVATE=github.com/circlefin/noble-cctp,github.com/noble-assets/cctp
+            - GOPRIVATE=github.com/noble-assets/cctp
           pre-build: |
             mkdir -p ~/.ssh
-            echo "${{ secrets.SSH_CIRCLE }}" | base64 -d > ~/.ssh/id_ed25519_circle
-            echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519_noble
-            chmod 600 ~/.ssh/id_ed25519_circle
-            chmod 600 ~/.ssh/id_ed25519_noble
+            echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519
+            chmod 600 ~/.ssh/id_ed25519
             apk add openssh
-            git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
             git config --global --add url."[email protected]:noble-assets/cctp.git".insteadOf "https://github.com/noble-assets/cctp"
             ssh-keyscan github.com >> ~/.ssh/known_hosts
           binaries: |
@@ -64,13 +61,10 @@ jobs:
     - name: CCTP private repo auth
       run: |
         mkdir -p ~/.ssh
-        echo "${{ secrets.SSH_CIRCLE }}" | base64 -d > ~/.ssh/id_ed25519_circle
-        echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519_noble
-        chmod 600 ~/.ssh/id_ed25519_circle
-        chmod 600 ~/.ssh/id_ed25519_noble
+        echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519
+        chmod 600 ~/.ssh/id_ed25519
         ssh-keyscan github.com >> ~/.ssh/known_hosts
-        export GOPRIVATE=github.com/circlefin/noble-cctp,github.com/noble-assets/cctp
-        git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
+        export GOPRIVATE=github.com/noble-assets/cctp
         git config --global --add url."[email protected]:noble-assets/cctp.git".insteadOf "https://github.com/noble-assets/cctp"
 
     - name: Generate matrix
@@ -103,13 +97,10 @@ jobs:
       - name: CCTP private repo auth
         run: |
           mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_CIRCLE }}" | base64 -d > ~/.ssh/id_ed25519_circle
-          echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519_noble
-          chmod 600 ~/.ssh/id_ed25519_circle
-          chmod 600 ~/.ssh/id_ed25519_noble
+          echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
           ssh-keyscan github.com >> ~/.ssh/known_hosts
-          export GOPRIVATE=github.com/circlefin/noble-cctp,github.com/noble-assets/cctp
-          git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
+          export GOPRIVATE=github.com/noble-assets/cctp
           git config --global --add url."[email protected]:noble-assets/cctp.git".insteadOf "https://github.com/noble-assets/cctp"
 
       - name: Download Tarball Artifact

diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
@@ -18,13 +18,10 @@ jobs:
       - name: CCTP private repo auth
         run: |
           mkdir -p ~/.ssh
-          echo "${{ secrets.SSH_CIRCLE }}" | base64 -d > ~/.ssh/id_ed25519_circle
-          echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519_noble
-          chmod 600 ~/.ssh/id_ed25519_circle
-          chmod 600 ~/.ssh/id_ed25519_noble
+          echo "${{ secrets.SSH_NOBLE }}" | base64 -d > ~/.ssh/id_ed25519
+          chmod 600 ~/.ssh/id_ed25519
           ssh-keyscan github.com >> ~/.ssh/known_hosts
-          export GOPRIVATE=github.com/circlefin/noble-cctp,github.com/noble-assets/cctp
-          git config --global --add url."[email protected]:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp"
+          export GOPRIVATE=github.com/noble-assets/cctp
           git config --global --add url."[email protected]:noble-assets/cctp.git".insteadOf "https://github.com/noble-assets/cctp"
 
       - name: Run Unit Tests