feat(github): better workflows

buroa · Dec 31, 2024 · 8d33b44 · 8d33b44
1 parent a5d8da8
commit 8d33b44
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/flux-diff.yaml b/.github/workflows/flux-diff.yaml
@@ -48,8 +48,8 @@ jobs:
           args: >-
             diff ${{ matrix.resources }}
             --unified 6
-            --path ${{ github.workspace }}/pull/kubernetes/flux
-            --path-orig ${{ github.workspace }}/default/kubernetes/flux
+            --path /github/workspace/pull/kubernetes/flux
+            --path-orig /github/workspace/default/kubernetes/flux
             --strip-attrs "helm.sh/chart,checksum/config,app.kubernetes.io/version,chart"
             --limit-bytes 10000
             --all-namespaces
@@ -59,14 +59,18 @@ jobs:
       - name: Generate Diff
         id: diff
         run: |
-          diff=$(cat diff.patch)
-          echo "diff<<EOF" >> $GITHUB_OUTPUT
-          echo "$diff" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-          echo "### Diff" >> GITHUB_STEP_SUMMARY
-          echo '```diff' >> GITHUB_STEP_SUMMARY
-          echo "$diff" >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
+          cat diff.patch;
+          {
+              echo 'diff<<EOF'
+              cat diff.patch
+              echo EOF
+          } >> "$GITHUB_OUTPUT";
+          {
+              echo "### Diff"
+              echo '```diff'
+              cat diff.patch
+              echo '```'
+          } >> "$GITHUB_STEP_SUMMARY"
 
       - if: ${{ steps.diff.outputs.diff != '' }}
         name: Add Comment

diff --git a/.github/workflows/pre-pull-images.yaml b/.github/workflows/pre-pull-images.yaml
@@ -76,7 +76,7 @@ jobs:
         with:
           args: >-
             get cluster
-            --path ${{ github.workspace }}/kubernetes/flux
+            --path /github/workspace/kubernetes/flux
             --enable-images
             --output yaml
             --output-file images.yaml