From b705bf3beec4c6a11f7cf79d6d41750eeff18157 Mon Sep 17 00:00:00 2001
From: Frantjc <logsdonalex11@gmail.com>
Date: Thu, 14 Mar 2024 16:32:18 -0400
Subject: [PATCH] automation and wit orks

---
 .github/workflows/build-action.yml | 11 +++++------
 .github/workflows/build-shims.yml  | 11 +++++------
 testdata/actions/dind/action.yml   |  2 +-
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-action.yml b/.github/workflows/build-action.yml
index 3bb09561..391d7d2b 100644
--- a/.github/workflows/build-action.yml
+++ b/.github/workflows/build-action.yml
@@ -27,18 +27,17 @@ jobs:
           cd ../..
           make action
       - uses: peter-evans/create-pull-request@v6
-        env:
-          COMMIT_MESSAGE: |
-            Update [.github/action](.github/action) built by GitHub Actions workflow "${{ github.workflow }}" run ${{ github.server_url }}/${{ github.repository }}/actions/${{ github.run_id }} for user ${{ github.actor }} from commit ${{ github.sha }}.
         with:
           add-paths: |
             .github/action
           reviewers: |
             ${{ github.actor }}
           title: |
-            Build .github/action
-          commit-message: ${{ env.COMMIT_MESSAGE }}
-          body: ${{ env.COMMIT_MESSAGE }}
+            Bump .github/action
+          commit-message: |
+            Update .github/action built by GitHub Actions workflow "${{ github.workflow }}" for user ${{ github.actor }} from commit ${{ github.sha }}.
+          body: |
+            Update [.github/action](.github/action) built by [GitHub Actions workflow "${{ github.workflow }}"](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for user ${{ github.actor }} from commit ${{ github.sha }}.
           branch: github-actions/gen/github/action
           delete-branch: true
           labels: github_actions
diff --git a/.github/workflows/build-shims.yml b/.github/workflows/build-shims.yml
index ff0104dc..e0237d4f 100644
--- a/.github/workflows/build-shims.yml
+++ b/.github/workflows/build-shims.yml
@@ -20,9 +20,6 @@ jobs:
           make shim GOARCH=amd64
           make shim GOARCH=arm64
       - uses: peter-evans/create-pull-request@v6
-        env:
-          COMMIT_MESSAGE: |
-            Update [internal/bin/shim_*](internal/bin) built by GitHub Actions workflow "${{ github.workflow }}" run ${{ github.server_url }}/${{ github.repository }}/actions/${{ github.run_id }} for user ${{ github.actor }} from commit ${{ github.sha }}.
         with:
           add-paths: |
             internal/bin/shim_amd64
@@ -30,9 +27,11 @@ jobs:
           reviewers: |
             ${{ github.actor }}
           title: |
-            Build internal/bin/shim_*
-          commit-message: ${{ env.COMMIT_MESSAGE }}
-          body: ${{ env.COMMIT_MESSAGE }}
+            Bump internal/bin/shim_*
+          commit-message: |
+            Update internal/bin/shim_* built by GitHub Actions workflow "${{ github.workflow }}" for user ${{ github.actor }} from commit ${{ github.sha }}.
+          body: |
+            Update [internal/bin/shim_*](internal/bin) built by [GitHub Actions workflow "${{ github.workflow }}"](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}) for user ${{ github.actor }} from commit ${{ github.sha }}.
           branch: github-actions/gen/internal/bin
           delete-branch: true
           labels: go
diff --git a/testdata/actions/dind/action.yml b/testdata/actions/dind/action.yml
index c4ebcb2c..e4df9784 100644
--- a/testdata/actions/dind/action.yml
+++ b/testdata/actions/dind/action.yml
@@ -9,4 +9,4 @@ runs:
   args:
     - -c
     - |
-      docker run --rm -v /foo:/tmp alpine ls /tmp
+      docker run --rm -v $GITHUB_WORKSPACE:/tmp alpine ls /tmp