From 5fa62073d7ec8269fb690e48397a7adf461adb96 Mon Sep 17 00:00:00 2001 From: John Letey Date: Tue, 17 Oct 2023 13:58:31 +0200 Subject: [PATCH] chore: another attempt --- .github/workflows/docker-publish.yaml | 9 +++------ .github/workflows/draft-release.yaml | 9 +++------ .github/workflows/e2e-tests.yaml | 27 +++++++++------------------ .github/workflows/unit-tests.yaml | 9 +++------ 4 files changed, 18 insertions(+), 36 deletions(-) diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml index 57211064..fac7e7d5 100644 --- 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."git@github.com:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp" git config --global --add url."git@github.com: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 index c436cd72..5353e19b 100644 --- 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."git@github.com:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp" git config --global --add url."git@github.com: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 index 6ce76b73..b49cf8fe 100644 --- 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."git@github.com:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp" git config --global --add url."git@github.com: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."git@github.com:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp" + export GOPRIVATE=github.com/noble-assets/cctp git config --global --add url."git@github.com: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."git@github.com:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp" + export GOPRIVATE=github.com/noble-assets/cctp git config --global --add url."git@github.com: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 index 6b90a727..f83a355b 100644 --- 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."git@github.com:circlefin/noble-cctp.git".insteadOf "https://github.com/circlefin/noble-cctp" + export GOPRIVATE=github.com/noble-assets/cctp git config --global --add url."git@github.com:noble-assets/cctp.git".insteadOf "https://github.com/noble-assets/cctp" - name: Run Unit Tests