From df231e3f2c60746d8966ce12028174cd5dc2e62d Mon Sep 17 00:00:00 2001
From: Serhii Snitsaruk <limbonaut@pm.me>
Date: Sat, 16 Dec 2023 14:03:34 +0100
Subject: [PATCH] GHA: Double zip editor artifacts for MacOS and Linux (fix for
 #6).

Workaround for https://github.com/actions/upload-artifact/issues/38.
---
 .github/workflows/linux.yml | 12 ++++++++++++
 .github/workflows/macos.yml |  7 +++++++
 2 files changed, 19 insertions(+)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 73fed9a8..800e9dd1 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -179,6 +179,18 @@ jobs:
           mv bin/* ${{env.OUTDIR}}
           ls -R out/
 
+      # Zipping the editor artifact to retain executable bit;
+      # workaround for: https://github.com/actions/upload-artifact/issues/38
+      - name: Zip the editor artifact
+        if: matrix.target == 'editor'
+        shell: bash
+        run: |
+          pushd out/
+          zip -r godot-limboai.editor.linux.zip *
+          rm godot.*
+          echo -e "## Why another ZIP inside?\n\nWorkaround for: https://github.com/actions/upload-artifact/issues/38\n" > README.md
+          popd
+
       - name: Rename templates
         if: startsWith(matrix.target, 'template')
         env:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 227afc8c..38dd1934 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -223,6 +223,8 @@ jobs:
           name: macos-editor
           path: bin/
 
+      # Zipping the editor bundle to retain executable bit;
+      # workaround for: https://github.com/actions/upload-artifact/issues/38
       - name: Make editor bundle
         run: |
           ls bin/
@@ -234,6 +236,11 @@ jobs:
           mkdir -p out/editor/Godot.app/Contents/MacOS
           cp bin/godot.macos.editor.universal out/editor/Godot.app/Contents/MacOS/Godot
           chmod +x out/editor/Godot.app/Contents/MacOS/Godot
+          pushd out/editor
+          zip -r Godot.app.zip Godot.app
+          rm -rf Godot.app
+          echo -e "## Why another ZIP inside?\n\nWorkaround for: https://github.com/actions/upload-artifact/issues/38\n" > README.md
+          popd
           ls out/editor/
 
       - name: Upload editor bundle