From 1b53544111c429c12e31f6466a3b03fc4655e72a Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 5 Dec 2020 08:52:50 -0500
Subject: GHA: Use meeDamian/github-release to create/update release

---
 .github/workflows/nightly.yml | 58 +++++++++++++------------------------------
 1 file changed, 17 insertions(+), 41 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index f1b524921f..5bbc8917f8 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -26,7 +26,7 @@ jobs:
           tar cfz nvim-linux64.tar.gz nvim-linux64
       - uses: actions/upload-artifact@v2
         with:
-          name: nvim-linux64.tar.gz
+          name: nvim-linux64
           path: build/nightly/nvim-linux64.tar.gz
           retention-days: 1
 
@@ -44,12 +44,12 @@ jobs:
           make appimage-nightly
       - uses: actions/upload-artifact@v2
         with:
-          name: nvim.appimage
+          name: appimage
           path: build/bin/nvim.appimage
           retention-days: 1
       - uses: actions/upload-artifact@v2
         with:
-          name: nvim.appimage.zsync
+          name: appimage
           path: build/bin/nvim.appimage.zsync
           retention-days: 1
 
@@ -86,7 +86,7 @@ jobs:
           tar cjSf nvim-macos.tar.bz2 -C bundle nvim
       - uses: actions/upload-artifact@v2
         with:
-          name: nvim-macos.tar.bz2
+          name: nvim-macos
           path: build/nightly/nvim-macos.tar.bz2
           retention-days: 1
 
@@ -95,11 +95,20 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/download-artifact@v2
-      - uses: actions/create-release@v1
-        id: create_release
+      - uses: meeDamian/github-release@2.0
         with:
-          tag_name: nightly
-          release_name: NVIM ${{ needs.linux.outputs.release }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: nightly
+          name: ${{ needs.linux.outputs.release }}
+          prerelease: true
+          commitish: ${{ github.sha }}
+          gzip: false
+          allow_override: true
+          files: |
+            nvim-macos.tar.bz2:./nvim-macos/nvim-macos.tar.bz2
+            nvim-linux64.tar.gz:./nvim-linux64/nvim-linux64.tar.gz
+            nvim.appimage:./appimage/nvim.appimage
+            nvim.appimage.zsync:./appimage/nvim.appimage.zsync
           body: |
             Nvim development (prerelease) build.
             ```
@@ -132,36 +141,3 @@ jobs:
             ### Other
 
             - Install by [package manager](https://github.com/neovim/neovim/wiki/Installing-Neovim)
-          prerelease: true
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./nvim-macos.tar.bz2
-          asset_name: nvim-macos.tar.bz2
-          asset_content_type: application/x-bzip2
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./nvim-linux64.tar.gz
-          asset_name: nvim-linux64.tar.gz
-          asset_content_type: application/gzip
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./nvim.appimage
-          asset_name: nvim.appimage
-          asset_content_type: application/x-executable
-      - uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./nvim.appimage.zsync
-          asset_name: nvim.appimage.zsync
-          asset_content_type: application/octet-stream
-- 
cgit 


From 7ab458f92910ac4d5f4a5c7791a2d7b69e179889 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 5 Dec 2020 11:47:03 -0500
Subject: GHA: Add support for manually creating a release

---
 .github/workflows/nightly.yml | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5bbc8917f8..aeb0e6dfe8 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -2,6 +2,12 @@ name: Nightly release
 on:
   schedule:
     - cron: '5 5 * * *'
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Tag name for release'
+        required: false
+        default: nightly
 
 jobs:
   linux:
@@ -95,25 +101,32 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/download-artifact@v2
+      - if: github.event_name == 'workflow_dispatch'
+        run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
+      - if: github.event_name == 'scheduled'
+        run: echo 'TAG_NAME=nightly' >> $GITHUB_ENV
+      - if: env.TAG_NAME == 'nightly'
+        run: echo 'SUBJECT=Nvim development (prerelease) build' >> $GITHUB_ENV
+      - if: env.TAG_NAME != 'nightly'
+        run: echo 'SUBJECT=Nvim release build' >> $GITHUB_ENV
       - uses: meeDamian/github-release@2.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-          tag: nightly
+          tag: ${{ env.TAG_NAME }}
           name: ${{ needs.linux.outputs.release }}
-          prerelease: true
+          prerelease: ${{ env.TAG_NAME == 'nightly' }}
           commitish: ${{ github.sha }}
           gzip: false
-          allow_override: true
+          allow_override: ${{ env.TAG_NAME == 'nightly' }}
           files: |
             nvim-macos.tar.bz2:./nvim-macos/nvim-macos.tar.bz2
             nvim-linux64.tar.gz:./nvim-linux64/nvim-linux64.tar.gz
             nvim.appimage:./appimage/nvim.appimage
             nvim.appimage.zsync:./appimage/nvim.appimage.zsync
           body: |
-            Nvim development (prerelease) build.
-            ```
-            ${{ needs.linux.outputs.version }}
+            ${{ env.SUBJECT }}
             ```
+            ${{ needs.linux.outputs.version }}```
 
             ## Install
 
-- 
cgit 


From f7fd7ba745e11220057f9bd33b9e6eea091a9709 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 5 Dec 2020 11:48:07 -0500
Subject: GHA: Automatically create a release for versioned tags

---
 .github/workflows/nightly.yml | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index aeb0e6dfe8..d8c2f76282 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -8,6 +8,9 @@ on:
         description: 'Tag name for release'
         required: false
         default: nightly
+  push:
+    tags:
+      - v[0-9]+.[0-9]+.[0-9]+
 
 jobs:
   linux:
@@ -105,6 +108,10 @@ jobs:
         run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
       - if: github.event_name == 'scheduled'
         run: echo 'TAG_NAME=nightly' >> $GITHUB_ENV
+      - if: github.event_name == 'push'
+        run: |
+          TAG_NAME=${{ github.ref }}
+          echo "TAG_NAME=${TAG_NAME#refs/tags/}" >> $GITHUB_ENV
       - if: env.TAG_NAME == 'nightly'
         run: echo 'SUBJECT=Nvim development (prerelease) build' >> $GITHUB_ENV
       - if: env.TAG_NAME != 'nightly'
-- 
cgit 


From e11f3fb726db3eb9fb2cd18720d96fdc55d2447f Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 5 Dec 2020 11:50:29 -0500
Subject: GHA: Rename "Nightly release" to "Release"

---
 .github/workflows/nightly.yml | 163 ------------------------------------------
 .github/workflows/release.yml | 163 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 163 insertions(+), 163 deletions(-)
 delete mode 100644 .github/workflows/nightly.yml
 create mode 100644 .github/workflows/release.yml

(limited to '.github/workflows')

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
deleted file mode 100644
index d8c2f76282..0000000000
--- a/.github/workflows/nightly.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-name: Nightly release
-on:
-  schedule:
-    - cron: '5 5 * * *'
-  workflow_dispatch:
-    inputs:
-      tag_name:
-        description: 'Tag name for release'
-        required: false
-        default: nightly
-  push:
-    tags:
-      - v[0-9]+.[0-9]+.[0-9]+
-
-jobs:
-  linux:
-    runs-on: ubuntu-20.04
-    outputs:
-      version: ${{ steps.build.outputs.version }}
-      release: ${{ steps.build.outputs.release }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y autoconf automake build-essential cmake gcc-multilib gettext gperf libtool-bin locales ninja-build pkg-config unzip
-      - name: Build nightly
-        id: build
-        run: |
-          make CMAKE_BUILD_TYPE=RelWithDebinfo CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH="
-          printf '::set-output name=version::%s\n' "$(./build/bin/nvim --version | head -n 3 | sed -z 's/\n/%0A/g')"
-          printf '::set-output name=release::%s\n' "$(./build/bin/nvim --version | head -n 1 | sed 's/-.*//')"
-          make DESTDIR="$GITHUB_WORKSPACE/build/nightly/nvim-linux64" install
-          cd "$GITHUB_WORKSPACE/build/nightly"
-          tar cfz nvim-linux64.tar.gz nvim-linux64
-      - uses: actions/upload-artifact@v2
-        with:
-          name: nvim-linux64
-          path: build/nightly/nvim-linux64.tar.gz
-          retention-days: 1
-
-  appimage:
-    # Build on the oldest supported image, so we have broader compatibility
-    runs-on: ubuntu-16.04
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y autoconf automake build-essential cmake gcc-multilib gettext gperf libtool-bin locales ninja-build pkg-config unzip
-      - name: Build appimage
-        run: |
-          make appimage-nightly
-      - uses: actions/upload-artifact@v2
-        with:
-          name: appimage
-          path: build/bin/nvim.appimage
-          retention-days: 1
-      - uses: actions/upload-artifact@v2
-        with:
-          name: appimage
-          path: build/bin/nvim.appimage.zsync
-          retention-days: 1
-
-  macOS:
-    runs-on: macos-10.15
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install brew packages
-        run: |
-          brew update >/dev/null
-          brew install automake ninja
-      - name: Build nightly
-        run: |
-          make CMAKE_BUILD_TYPE=Release CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11"
-          make DESTDIR="$GITHUB_WORKSPACE/build/nightly/nvim-osx64" install
-      - name: Create package
-        run: |
-          cd "$GITHUB_WORKSPACE/build/nightly"
-          mkdir -p bundle/nvim/libs
-          mkdir -p bundle/nvim/bin
-          cp nvim-osx64/bin/nvim bundle/nvim/bin/
-          libs=($(otool -L nvim-osx64/bin/nvim | sed 1d | sed -E -e 's|^[[:space:]]*||' -e 's| .*||'))
-          echo "libs:"
-          for lib in "${libs[@]}"; do
-            if echo "$lib" | grep -q -E 'libSystem|CoreFoundation' 2>/dev/null; then
-              echo "  [skipped] $lib"
-            else
-              echo "  $lib"
-              relname="libs/${lib##*/}"
-              cp -L "$lib" "bundle/nvim/$relname"
-              install_name_tool -change "$lib" "@executable_path/../$relname" bundle/nvim/bin/nvim
-            fi
-          done
-          tar cjSf nvim-macos.tar.bz2 -C bundle nvim
-      - uses: actions/upload-artifact@v2
-        with:
-          name: nvim-macos
-          path: build/nightly/nvim-macos.tar.bz2
-          retention-days: 1
-
-  publish:
-    needs: [linux, appimage, macOS]
-    runs-on: ubuntu-20.04
-    steps:
-      - uses: actions/download-artifact@v2
-      - if: github.event_name == 'workflow_dispatch'
-        run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
-      - if: github.event_name == 'scheduled'
-        run: echo 'TAG_NAME=nightly' >> $GITHUB_ENV
-      - if: github.event_name == 'push'
-        run: |
-          TAG_NAME=${{ github.ref }}
-          echo "TAG_NAME=${TAG_NAME#refs/tags/}" >> $GITHUB_ENV
-      - if: env.TAG_NAME == 'nightly'
-        run: echo 'SUBJECT=Nvim development (prerelease) build' >> $GITHUB_ENV
-      - if: env.TAG_NAME != 'nightly'
-        run: echo 'SUBJECT=Nvim release build' >> $GITHUB_ENV
-      - uses: meeDamian/github-release@2.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ env.TAG_NAME }}
-          name: ${{ needs.linux.outputs.release }}
-          prerelease: ${{ env.TAG_NAME == 'nightly' }}
-          commitish: ${{ github.sha }}
-          gzip: false
-          allow_override: ${{ env.TAG_NAME == 'nightly' }}
-          files: |
-            nvim-macos.tar.bz2:./nvim-macos/nvim-macos.tar.bz2
-            nvim-linux64.tar.gz:./nvim-linux64/nvim-linux64.tar.gz
-            nvim.appimage:./appimage/nvim.appimage
-            nvim.appimage.zsync:./appimage/nvim.appimage.zsync
-          body: |
-            ${{ env.SUBJECT }}
-            ```
-            ${{ needs.linux.outputs.version }}```
-
-            ## Install
-
-            ### Windows
-
-            1. Extract **nvim-win64.zip** (or **nvim-win32.zip**)
-            2. Run `nvim-qt.exe`
-
-            ### macOS
-
-            1. Download **nvim-macos.tar.gz**
-            2. Extract: `tar xzvf nvim-macos.tar.gz`
-            3. Run `./nvim-osx64/bin/nvim`
-
-            ### Linux (x64)
-
-            1. Download **nvim.appimage**
-            2. Run `chmod u+x nvim.appimage && ./nvim.appimage`
-               - If your system does not have FUSE you can [extract the appimage](https://github.com/AppImage/AppImageKit/wiki/FUSE#type-2-appimage):
-                 ```
-                 ./nvim.appimage --appimage-extract
-                 ./squashfs-root/usr/bin/nvim
-                 ```
-
-            ### Other
-
-            - Install by [package manager](https://github.com/neovim/neovim/wiki/Installing-Neovim)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000000..a1e2d0e4b7
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,163 @@
+name: Release
+on:
+  schedule:
+    - cron: '5 5 * * *'
+  workflow_dispatch:
+    inputs:
+      tag_name:
+        description: 'Tag name for release'
+        required: false
+        default: nightly
+  push:
+    tags:
+      - v[0-9]+.[0-9]+.[0-9]+
+
+jobs:
+  linux:
+    runs-on: ubuntu-20.04
+    outputs:
+      version: ${{ steps.build.outputs.version }}
+      release: ${{ steps.build.outputs.release }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y autoconf automake build-essential cmake gcc-multilib gettext gperf libtool-bin locales ninja-build pkg-config unzip
+      - name: Build nightly
+        id: build
+        run: |
+          make CMAKE_BUILD_TYPE=RelWithDebinfo CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH="
+          printf '::set-output name=version::%s\n' "$(./build/bin/nvim --version | head -n 3 | sed -z 's/\n/%0A/g')"
+          printf '::set-output name=release::%s\n' "$(./build/bin/nvim --version | head -n 1 | sed 's/-.*//')"
+          make DESTDIR="$GITHUB_WORKSPACE/build/nightly/nvim-linux64" install
+          cd "$GITHUB_WORKSPACE/build/nightly"
+          tar cfz nvim-linux64.tar.gz nvim-linux64
+      - uses: actions/upload-artifact@v2
+        with:
+          name: nvim-linux64
+          path: build/nightly/nvim-linux64.tar.gz
+          retention-days: 1
+
+  appimage:
+    # Build on the oldest supported image, so we have broader compatibility
+    runs-on: ubuntu-16.04
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y autoconf automake build-essential cmake gcc-multilib gettext gperf libtool-bin locales ninja-build pkg-config unzip
+      - name: Build appimage
+        run: |
+          make appimage-nightly
+      - uses: actions/upload-artifact@v2
+        with:
+          name: appimage
+          path: build/bin/nvim.appimage
+          retention-days: 1
+      - uses: actions/upload-artifact@v2
+        with:
+          name: appimage
+          path: build/bin/nvim.appimage.zsync
+          retention-days: 1
+
+  macOS:
+    runs-on: macos-10.15
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install brew packages
+        run: |
+          brew update >/dev/null
+          brew install automake ninja
+      - name: Build nightly
+        run: |
+          make CMAKE_BUILD_TYPE=Release CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11"
+          make DESTDIR="$GITHUB_WORKSPACE/build/nightly/nvim-osx64" install
+      - name: Create package
+        run: |
+          cd "$GITHUB_WORKSPACE/build/nightly"
+          mkdir -p bundle/nvim/libs
+          mkdir -p bundle/nvim/bin
+          cp nvim-osx64/bin/nvim bundle/nvim/bin/
+          libs=($(otool -L nvim-osx64/bin/nvim | sed 1d | sed -E -e 's|^[[:space:]]*||' -e 's| .*||'))
+          echo "libs:"
+          for lib in "${libs[@]}"; do
+            if echo "$lib" | grep -q -E 'libSystem|CoreFoundation' 2>/dev/null; then
+              echo "  [skipped] $lib"
+            else
+              echo "  $lib"
+              relname="libs/${lib##*/}"
+              cp -L "$lib" "bundle/nvim/$relname"
+              install_name_tool -change "$lib" "@executable_path/../$relname" bundle/nvim/bin/nvim
+            fi
+          done
+          tar cjSf nvim-macos.tar.bz2 -C bundle nvim
+      - uses: actions/upload-artifact@v2
+        with:
+          name: nvim-macos
+          path: build/nightly/nvim-macos.tar.bz2
+          retention-days: 1
+
+  publish:
+    needs: [linux, appimage, macOS]
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/download-artifact@v2
+      - if: github.event_name == 'workflow_dispatch'
+        run: echo "TAG_NAME=${{ github.event.inputs.tag_name }}" >> $GITHUB_ENV
+      - if: github.event_name == 'scheduled'
+        run: echo 'TAG_NAME=nightly' >> $GITHUB_ENV
+      - if: github.event_name == 'push'
+        run: |
+          TAG_NAME=${{ github.ref }}
+          echo "TAG_NAME=${TAG_NAME#refs/tags/}" >> $GITHUB_ENV
+      - if: env.TAG_NAME == 'nightly'
+        run: echo 'SUBJECT=Nvim development (prerelease) build' >> $GITHUB_ENV
+      - if: env.TAG_NAME != 'nightly'
+        run: echo 'SUBJECT=Nvim release build' >> $GITHUB_ENV
+      - uses: meeDamian/github-release@2.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ env.TAG_NAME }}
+          name: ${{ needs.linux.outputs.release }}
+          prerelease: ${{ env.TAG_NAME == 'nightly' }}
+          commitish: ${{ github.sha }}
+          gzip: false
+          allow_override: ${{ env.TAG_NAME == 'nightly' }}
+          files: |
+            nvim-macos.tar.bz2:./nvim-macos/nvim-macos.tar.bz2
+            nvim-linux64.tar.gz:./nvim-linux64/nvim-linux64.tar.gz
+            nvim.appimage:./appimage/nvim.appimage
+            nvim.appimage.zsync:./appimage/nvim.appimage.zsync
+          body: |
+            ${{ env.SUBJECT }}
+            ```
+            ${{ needs.linux.outputs.version }}```
+
+            ## Install
+
+            ### Windows
+
+            1. Extract **nvim-win64.zip** (or **nvim-win32.zip**)
+            2. Run `nvim-qt.exe`
+
+            ### macOS
+
+            1. Download **nvim-macos.tar.gz**
+            2. Extract: `tar xzvf nvim-macos.tar.gz`
+            3. Run `./nvim-osx64/bin/nvim`
+
+            ### Linux (x64)
+
+            1. Download **nvim.appimage**
+            2. Run `chmod u+x nvim.appimage && ./nvim.appimage`
+               - If your system does not have FUSE you can [extract the appimage](https://github.com/AppImage/AppImageKit/wiki/FUSE#type-2-appimage):
+                 ```
+                 ./nvim.appimage --appimage-extract
+                 ./squashfs-root/usr/bin/nvim
+                 ```
+
+            ### Other
+
+            - Install by [package manager](https://github.com/neovim/neovim/wiki/Installing-Neovim)
-- 
cgit 


From dfc4111e421bbb2cb8a4da04121538a06512b4e9 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 5 Dec 2020 12:02:00 -0500
Subject: GHA: Do not run CI for tags

---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 70cdc3b4a2..dcc3c2c45f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,5 +1,9 @@
 name: CI
-on: [push, pull_request]
+on:
+  push:
+    branches: '**'
+  pull_request:
+    branches: 'master'
 
 jobs:
   build:
-- 
cgit 


From 18360290d088b6bd1066ad3b97856ffe4adde627 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 5 Dec 2020 12:28:56 -0500
Subject: GHA: Generate correct appimage for release/nightly

---
 .github/workflows/release.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a1e2d0e4b7..9fc7feca33 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,19 +24,19 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y autoconf automake build-essential cmake gcc-multilib gettext gperf libtool-bin locales ninja-build pkg-config unzip
-      - name: Build nightly
+      - name: Build release
         id: build
         run: |
           make CMAKE_BUILD_TYPE=RelWithDebinfo CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH="
           printf '::set-output name=version::%s\n' "$(./build/bin/nvim --version | head -n 3 | sed -z 's/\n/%0A/g')"
           printf '::set-output name=release::%s\n' "$(./build/bin/nvim --version | head -n 1 | sed 's/-.*//')"
-          make DESTDIR="$GITHUB_WORKSPACE/build/nightly/nvim-linux64" install
-          cd "$GITHUB_WORKSPACE/build/nightly"
+          make DESTDIR="$GITHUB_WORKSPACE/build/release/nvim-linux64" install
+          cd "$GITHUB_WORKSPACE/build/release"
           tar cfz nvim-linux64.tar.gz nvim-linux64
       - uses: actions/upload-artifact@v2
         with:
           name: nvim-linux64
-          path: build/nightly/nvim-linux64.tar.gz
+          path: build/release/nvim-linux64.tar.gz
           retention-days: 1
 
   appimage:
@@ -48,9 +48,10 @@ jobs:
         run: |
           sudo apt-get update
           sudo apt-get install -y autoconf automake build-essential cmake gcc-multilib gettext gperf libtool-bin locales ninja-build pkg-config unzip
-      - name: Build appimage
-        run: |
-          make appimage-nightly
+      - if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name != 'nightly')
+        run: make appimage-latest
+      - if: github.event_name == 'scheduled' || (github.event_name == 'workflow_dispatch' && github.event.inputs.tag_name == 'nightly')
+        run: make appimage-nightly
       - uses: actions/upload-artifact@v2
         with:
           name: appimage
@@ -70,13 +71,13 @@ jobs:
         run: |
           brew update >/dev/null
           brew install automake ninja
-      - name: Build nightly
+      - name: Build release
         run: |
           make CMAKE_BUILD_TYPE=Release CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11"
-          make DESTDIR="$GITHUB_WORKSPACE/build/nightly/nvim-osx64" install
+          make DESTDIR="$GITHUB_WORKSPACE/build/release/nvim-osx64" install
       - name: Create package
         run: |
-          cd "$GITHUB_WORKSPACE/build/nightly"
+          cd "$GITHUB_WORKSPACE/build/release"
           mkdir -p bundle/nvim/libs
           mkdir -p bundle/nvim/bin
           cp nvim-osx64/bin/nvim bundle/nvim/bin/
@@ -96,7 +97,7 @@ jobs:
       - uses: actions/upload-artifact@v2
         with:
           name: nvim-macos
-          path: build/nightly/nvim-macos.tar.bz2
+          path: build/release/nvim-macos.tar.bz2
           retention-days: 1
 
   publish:
-- 
cgit