From aad58f1d6b3fa104c8fc6ecc6240adf5985c32b9 Mon Sep 17 00:00:00 2001
From: iofq <cjriddz@protonmail.com>
Date: Sat, 27 May 2023 03:59:31 -0500
Subject: [PATCH] update CI

---
 .github/workflows/main.yml | 24 ++++++++++--------------
 .gitignore                 |  2 +-
 Dockerfile                 | 14 +++++++++-----
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 03da694..fb087ac 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,36 +11,32 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
-      -
-        name: Login to ghcr.io
+      - name: Login to ghcr.io
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      -
-        name: Build container and push to ghcr.io
+      - name: Build container and push to ghcr.io
         uses: docker/build-push-action@v2
         with:
           push: true
           tags: ghcr.io/iofq/nvim:latest
-      -
-        name: Extract full .tar.gz from container
+      - name: Extract full .tar.gz from container
         uses: shrink/actions-docker-extract@v1
         id: extract
         with:
           image: ghcr.io/iofq/nvim:latest
-          path: /app/neovim-x86_64-linux.AppImage
+          path: /out/neovim-x86_64-linux.AppImage
 
-      -
-        name: Extract minimal .tar.gz from container
+      - name: Extract minimal .tar.gz from container
         uses: shrink/actions-docker-extract@v1
         id: extract-minimal
         with:
           image: ghcr.io/iofq/nvim:latest
-          path: /app/neovim-x86_64-linux-minimal.AppImage
-      -
-        name: Upload archive to release
+          path: /out/neovim-x86_64-linux-minimal.AppImage
+
+      - name: Upload archive to release
         uses: xresloader/upload-to-github-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -48,8 +44,8 @@ jobs:
           file: ${{ steps.extract.outputs.destination }}
           update_latest_release: true
           overwrite: true
-      -
-        name: Upload archive to release
+
+      - name: Upload archive to release
         uses: xresloader/upload-to-github-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
index f7676fd..7d2c056 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 *.AppImage
-squashfs_root
+squashfs-root
diff --git a/Dockerfile b/Dockerfile
index 039223f..14379fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,22 @@
-FROM nixos/nix
+FROM nixos/nix as build
 
 WORKDIR /app
 COPY . .
 
-RUN nix bundle \
+RUN mkdir -p /out && \
+    nix bundle \
         -o nvim.AppImage \
         --bundler github:ralismark/nix-appimage \
         --extra-experimental-features nix-command \
         --extra-experimental-features flakes .#full && \
-        mv $(realpath nvim.AppImage) neovim-x86_64-linux.AppImage && \
+        mv $(realpath nvim.AppImage) /out/neovim-x86_64-linux.AppImage && \
     nix bundle \
         -o nvim-minimal.AppImage \
         --bundler github:ralismark/nix-appimage \
         --extra-experimental-features nix-command \
         --extra-experimental-features flakes .#minimal && \
-        mv $(realpath nvim-minimal.AppImage) neovim-x86_64-linux-minimal.AppImage && \
-        nix-collect-garbage
+        mv $(realpath nvim-minimal.AppImage) /out/neovim-x86_64-linux-minimal.AppImage
+
+FROM scratch
+WORKDIR /out
+COPY --from=build /out /out