From 8a1df68e538f2d6c10af6f6509ba6ada36a25ce1 Mon Sep 17 00:00:00 2001
From: Julien Pivotto <roidelapluie@o11y.eu>
Date: Thu, 8 Sep 2022 12:23:37 +0200
Subject: [PATCH] Update actions to keep permissions

Signed-off-by: Julien Pivotto <roidelapluie@o11y.eu>
---
 .github/actions/build/action.yml             |  2 +-
 .github/actions/publish_main/action.yml      |  5 +----
 .github/actions/publish_release/action.yml   |  5 +----
 .github/actions/restore_artifacts/action.yml | 22 ++++++++++++++++++++
 .github/actions/save_artefacts/action.yml    | 18 ----------------
 .github/actions/save_artifacts/action.yml    | 17 +++++++++++++++
 .github/workflows/ci.yml                     |  4 ++--
 7 files changed, 44 insertions(+), 29 deletions(-)
 create mode 100644 .github/actions/restore_artifacts/action.yml
 delete mode 100644 .github/actions/save_artefacts/action.yml
 create mode 100644 .github/actions/save_artifacts/action.yml

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index 52935e6d667..7b8e3605f05 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -18,6 +18,6 @@ runs:
     - uses: ./.github/actions/setup_environment
     - run: ~/go/bin/promu crossbuild -v --parallelism ${{ inputs.parallelism }} --parallelism-thread ${{ inputs.thread }} ${{ inputs.promu_opts }}
       shell: bash
-    - uses: ./.github/actions/save_artefacts
+    - uses: ./.github/actions/save_artifacts
       with:
         directory: .build
diff --git a/.github/actions/publish_main/action.yml b/.github/actions/publish_main/action.yml
index e19ed9f5f09..3ff45c20a32 100644
--- a/.github/actions/publish_main/action.yml
+++ b/.github/actions/publish_main/action.yml
@@ -26,10 +26,7 @@ runs:
     - uses: ./.github/actions/setup_environment
       with:
         enable_docker_multibuild: true
-    - name: Download all workflow run artifacts
-      uses: actions/download-artifact@v3
-      with:
-        name: artifact
+    - uses: ./.github/actions/restore_artifacts
     - uses: ./.github/actions/publish_images
       if: inputs.docker_hub_organization != '' && inputs.docker_hub_login != ''
       with:
diff --git a/.github/actions/publish_release/action.yml b/.github/actions/publish_release/action.yml
index fdc6a4bd773..580ff504766 100644
--- a/.github/actions/publish_release/action.yml
+++ b/.github/actions/publish_release/action.yml
@@ -26,10 +26,7 @@ runs:
     - uses: ./.github/actions/setup_environment
       with:
         enable_docker_multibuild: true
-    - name: Download all workflow run artifacts
-      uses: actions/download-artifact@v3
-      with:
-        name: artifact
+    - uses: ./.github/actions/restore_artifacts
     - run: promu crossbuild tarballs
       shell: bash
     - run: promu checksum .tarballs
diff --git a/.github/actions/restore_artifacts/action.yml b/.github/actions/restore_artifacts/action.yml
new file mode 100644
index 00000000000..3ac1a3351fe
--- /dev/null
+++ b/.github/actions/restore_artifacts/action.yml
@@ -0,0 +1,22 @@
+# Restore artifacts created by save_artifacts.
+# Tar is used because the default actions do not preserve directory structure
+# and file mode.
+name: Restore artifacts
+runs:
+  using: composite
+  steps:
+    - name: Download all workflow run artifacts
+      uses: actions/download-artifact@v3
+      with:
+        name: artifact
+        path: .artifacts
+    - run: |
+        for tar in .artifacts/*.tar
+        do
+          tar xvf $tar
+        done
+        rm -v .artifacts/*.tar
+      shell: bash
+    - uses: actions/upload-artifact@v3
+      with:
+        path: artifact-*.tar
diff --git a/.github/actions/save_artefacts/action.yml b/.github/actions/save_artefacts/action.yml
deleted file mode 100644
index bb37dcf7e17..00000000000
--- a/.github/actions/save_artefacts/action.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-# To preserve the directory structure, save an additional empty file at
-# the root of the working directory. GitHub action uses the least common
-# ancestor of all the search paths as the root directory for artefacts.
-name: Save artefacts
-inputs:
-  directory:
-    type: string
-    description: Path of the directory to save
-runs:
-  using: composite
-  steps:
-    - run: touch .keep
-      shell: bash
-    - uses: actions/upload-artifact@v3
-      with:
-        path: |
-          ${{ inputs.directory }}
-          .keep
diff --git a/.github/actions/save_artifacts/action.yml b/.github/actions/save_artifacts/action.yml
new file mode 100644
index 00000000000..e0b0440d01b
--- /dev/null
+++ b/.github/actions/save_artifacts/action.yml
@@ -0,0 +1,17 @@
+# Tar is used because the default actions do not preserve directory structure
+# and file mode.
+name: Save artifacts
+inputs:
+  directory:
+    type: string
+    description: Path of the directory to save
+runs:
+  using: composite
+  steps:
+    - run: |
+        tar cvf artifact.tar ${{ inputs.directory }}
+        mv artifact.tar artifact-$(sha1sum artifact.tar|awk '{ print $1 }').tar
+      shell: bash
+    - uses: actions/upload-artifact@v3
+      with:
+        path: artifact-*.tar
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a3ffefd931..59355e3ef4a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,7 +39,7 @@ jobs:
       - run: make assets-tarball
       - run: make ui-lint
       - run: make ui-test
-      - uses: ./.github/actions/save_artefacts
+      - uses: ./.github/actions/save_artifacts
         with:
           directory: .tarballs
 
@@ -150,7 +150,7 @@ jobs:
     uses: ./.github/workflows/codeql-analysis.yml
 
   publish_main:
-    name: Publish main branch artefacts
+    name: Publish main branch artifacts
     runs-on: ubuntu-latest
     needs: [test_ui, test_go, test_windows, golangci, codeql, build_all]
     if: github.event_name == 'push' && github.event.ref == 'refs/heads/main'