From f4809916d3574810cbad2fb1c41e41f690c47639 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sun, 6 Dec 2020 16:26:31 -0500
Subject: [PATCH] GHA: Include runtime in macos release tarball

---
 .github/workflows/release.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6d66ff0c18..610d62211a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -78,9 +78,7 @@ jobs:
       - name: Create package
         run: |
           cd "$GITHUB_WORKSPACE/build/release"
-          mkdir -p bundle/nvim/libs
-          mkdir -p bundle/nvim/bin
-          cp nvim-osx64/bin/nvim bundle/nvim/bin/
+          mkdir -p nvim-osx64/libs
           libs=($(otool -L nvim-osx64/bin/nvim | sed 1d | sed -E -e 's|^[[:space:]]*||' -e 's| .*||'))
           echo "libs:"
           for lib in "${libs[@]}"; do
@@ -89,15 +87,15 @@ jobs:
             else
               echo "  $lib"
               relname="libs/${lib##*/}"
-              cp -L "$lib" "bundle/nvim/$relname"
-              install_name_tool -change "$lib" "@executable_path/../$relname" bundle/nvim/bin/nvim
+              cp -L "$lib" "nvim-osx64/$relname"
+              install_name_tool -change "$lib" "@executable_path/../$relname" nvim-osx64/bin/nvim
             fi
           done
-          tar cjSf nvim-macos.tar.bz2 -C bundle nvim
+          tar cfz nvim-macos.tar.gz nvim-osx64
       - uses: actions/upload-artifact@v2
         with:
           name: nvim-macos
-          path: build/release/nvim-macos.tar.bz2
+          path: build/release/nvim-macos.tar.gz
           retention-days: 1
 
   publish:
@@ -134,7 +132,7 @@ jobs:
           gzip: false
           allow_override: ${{ env.TAG_NAME == 'nightly' }}
           files: |
-            nvim-macos.tar.bz2:./nvim-macos/nvim-macos.tar.bz2
+            nvim-macos.tar.gz:./nvim-macos/nvim-macos.tar.gz
             nvim-linux64.tar.gz:./nvim-linux64/nvim-linux64.tar.gz
             nvim.appimage:./appimage/nvim.appimage
             nvim.appimage.zsync:./appimage/nvim.appimage.zsync