fix: earthly-setup

input-output-hk · Sep 23, 2024 · 1bd5715 · 1bd5715
1 parent d05a299
commit 1bd5715
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.github/actions/images/build-and-publish-ghcr/action.yml b/.github/actions/images/build-and-publish-ghcr/action.yml
@@ -19,7 +19,7 @@ runs:
         ref: ${{ inputs.sha }}
 
     - name: Setup Earthly
-      uses: ./.github/actions/earthly-setup
+      uses: ./.github/earthly-setup
       with:
         ssh_key: ${{ secrets.SUBSTRATE_REPO_SSH_KEY }}
         config_tar: ${{ secrets.EARTHLY_TAR }}

diff --git a/.github/actions/earthly-setup/action.yml → .github/earthly-setup/action.yml b/.github/actions/earthly-setup/action.yml → .github/earthly-setup/action.yml
@@ -12,7 +12,7 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Setup Earthly
+    - name: Setup earthly
       uses: earthly/actions-setup@v1
       with:
         github-token: ${{ github.token }}
@@ -25,13 +25,12 @@ runs:
         EARTHLY_TAR: ${{ inputs.config_tar }}
       run: |
         if [[ "${{ inputs.config_tar }}" != "" ]]; then
-          mkdir -p $HOME/.earthly
-          printf "%s" "$EARTHLY_TAR" | base64 -d | tar -C $HOME/.earthly --zstd -x
-          ls -al $HOME/.earthly
+          mkdir -p ~/.earthly
+          printf "%s" "$EARTHLY_TAR" | base64 -d | tar -C ~/.earthly --zstd -x
         fi
         if [[ "${{ inputs.ssh_key }}" != "" ]]; then
           mkdir -p ~/.ssh
           ssh-keyscan github.com >> ~/.ssh/known_hosts
-          eval "$(ssh-agent -s)"
+          ssh-agent -a "$SSH_AUTH_SOCK" > /dev/null || true
           ssh-add - <<< "${{ inputs.ssh_key }}"
         fi
diff --git a/.github/workflows/earthly-build-and-push.yml b/.github/workflows/earthly-build-and-push.yml
@@ -45,7 +45,7 @@ jobs:
           ref: ${{ inputs.branch }}
 
       - name: Setup Earthly
-        uses: ./.github/actions/earthly-setup
+        uses: ./.github/earthly-setup
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci-off') }}
         with:
           ssh_key: ${{ secrets.SUBSTRATE_REPO_SSH_KEY }}

diff --git a/.github/workflows/earthly.yml b/.github/workflows/earthly.yml
@@ -38,7 +38,7 @@ jobs:
           ref: ${{ inputs.branch || github.ref }}
 
       - name: Setup Earthly
-        uses: ./.github/actions/earthly-setup
+        uses: ./.github/earthly-setup
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'ci-off') }}
         with:
           ssh_key: ${{ secrets.SUBSTRATE_REPO_SSH_KEY }}