From 1b834851ff28f7852c2b321191c0e9ae2ec4b1bd Mon Sep 17 00:00:00 2001 From: Marcin Maciaszczyk Date: Tue, 26 Nov 2024 13:20:43 +0100 Subject: [PATCH 1/2] start ssh-agent --- .github/workflows/e2e.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 42bb53d7..cf4d9947 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -17,7 +17,6 @@ env: PLURAL_UP_AFFIRM_DEPLOY: true TESTOUT_PATH: /home/runner/testout SSH_PATH: /home/runner/.ssh - SSH_AUTH_SOCK: /tmp/ssh_agent.sock VENOM_VAR_directory: /home/runner/testout/azure VENOM_VAR_gitRepo: git@github.com:pluralsh/plural-cli-e2e.git VENOM_VAR_gitRepoPrivateKeyPath: /home/runner/.ssh/github_actions @@ -37,7 +36,7 @@ jobs: mkdir -p $SSH_PATH (base64 -d <<< ${{ secrets.E2E_REPO_PRIVATE_KEY }}) >> $VENOM_VAR_gitRepoPrivateKeyPath chmod 600 VENOM_VAR_gitRepoPrivateKeyPath - ssh-agent -a $SSH_AUTH_SOCK > /dev/null + eval `ssh-agent -s` ssh-add $VENOM_VAR_gitRepoPrivateKeyPath - name: Setup Go uses: actions/setup-go@v4.1.0 @@ -93,7 +92,7 @@ jobs: mkdir -p $SSH_PATH (base64 -d <<< ${{ secrets.E2E_REPO_PRIVATE_KEY }}) >> $VENOM_VAR_gitRepoPrivateKeyPath chmod 600 VENOM_VAR_gitRepoPrivateKeyPath - ssh-agent -a $SSH_AUTH_SOCK > /dev/null + eval `ssh-agent -s` ssh-add $VENOM_VAR_gitRepoPrivateKeyPath - name: Setup Go uses: actions/setup-go@v4.1.0 From d7d534f5c4046475caf0b07671cbe04c0eb57836 Mon Sep 17 00:00:00 2001 From: Marcin Maciaszczyk Date: Tue, 26 Nov 2024 13:21:48 +0100 Subject: [PATCH 2/2] fix typo --- .github/workflows/e2e.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index cf4d9947..ef080882 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -35,7 +35,7 @@ jobs: run: | mkdir -p $SSH_PATH (base64 -d <<< ${{ secrets.E2E_REPO_PRIVATE_KEY }}) >> $VENOM_VAR_gitRepoPrivateKeyPath - chmod 600 VENOM_VAR_gitRepoPrivateKeyPath + chmod 600 $VENOM_VAR_gitRepoPrivateKeyPath eval `ssh-agent -s` ssh-add $VENOM_VAR_gitRepoPrivateKeyPath - name: Setup Go @@ -91,7 +91,7 @@ jobs: run: | mkdir -p $SSH_PATH (base64 -d <<< ${{ secrets.E2E_REPO_PRIVATE_KEY }}) >> $VENOM_VAR_gitRepoPrivateKeyPath - chmod 600 VENOM_VAR_gitRepoPrivateKeyPath + chmod 600 $VENOM_VAR_gitRepoPrivateKeyPath eval `ssh-agent -s` ssh-add $VENOM_VAR_gitRepoPrivateKeyPath - name: Setup Go