Fix AppImage support and Dockerfile for testing (#1941)

* Fix AppImage support and Dockerfile for testing * Fix the desktop entry name
neovide · Jul 30, 2023 · a970c99 · a970c99
1 parent 39af18d
commit a970c99
Show file tree

Hide file tree

Showing 8 changed files with 200 additions and 96 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -95,7 +95,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macOS-11, ubuntu-latest]
+        # NOTE: Should use the oldest available Ubuntu release, for maximum compatibility
+        os: [windows-latest, macOS-11, ubuntu-20.04]
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -143,14 +144,14 @@ jobs:
           elif [[ $RUNNER_OS == "macOS" ]]; then
             echo "MACOSX_DEPLOYMENT_TARGET=10.11" >> $GITHUB_ENV
             # x86
-            cargo build --release --target=x86_64-apple-darwin
+            cargo build --locked --release --target=x86_64-apple-darwin
             cargo bundle --release --target=x86_64-apple-darwin
             # arch 
-            cargo build --release --target=aarch64-apple-darwin
+            cargo build --locked --release --target=aarch64-apple-darwin
             cargo bundle --release --target=aarch64-apple-darwin
 
           elif [[ $RUNNER_OS == "Linux" ]]; then
-            cargo build --release
+            cargo build --locked --release
           fi
 
       - name: Prepare Artifacts
@@ -186,17 +187,22 @@ jobs:
             # create appimage
             curl -Lo linuxdeploy https://github.com/linuxdeploy/linuxdeploy/releases/latest/download/linuxdeploy-x86_64.AppImage
             chmod +x linuxdeploy
+            curl -Lo linuxdeploy-plugin-appimage https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/latest/download/linuxdeploy-plugin-appimage-x86_64.AppImage
+            chmod +x linuxdeploy-plugin-appimage 
+
+            export LDAI_OUTPUT=neovide.AppImage
+            export LDAI_UPDATE_INFORMATION="gh-releases-zsync|neovide|neovide|latest|neovide.AppImage.zsync"
             ./linuxdeploy \
               --executable=neovide \
               --desktop-file=../../assets/neovide.desktop \
               --appdir=AppDir \
               --icon-file=../../assets/neovide.svg \
               --output=appimage
 
-            mv Neovide_\(nvim\)-*.AppImage neovide.AppImage
 
             echo "ARTIFACT=neovide-linux-x86_64.tar.gz" >> $GITHUB_ENV
             echo "ARTIFACT2=neovide.AppImage" >> $GITHUB_ENV
+            echo "ARTIFACT3=neovide.AppImage.zsync" >> $GITHUB_ENV
           fi
 
       - uses: actions/upload-artifact@v3
@@ -209,3 +215,9 @@ jobs:
         with:
           name: ${{ env.ARTIFACT2 }}
           path: target/release/${{ env.ARTIFACT2 }}
+
+      - if: env.ARTIFACT3
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.ARTIFACT3 }}
+          path: target/release/${{ env.ARTIFACT3 }}
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /target
+/target-ubuntu
 /.vs
 **/*.rs.bk
 *.log