fix pre-release archives

commit f644ba7 Author: Clément DOUIN <[email protected]> Date: Wed Oct 30 16:30:39 2024 +0100 do not remove share folder commit 00e7148 Author: Clément DOUIN <[email protected]> Date: Wed Oct 30 16:21:35 2024 +0100 upload folder and exe instead of archive
pimalaya · Oct 30, 2024 · 92814d6 · 92814d6
1 parent fecbae0
commit 92814d6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -39,13 +39,10 @@ jobs:
         run: |
           nix build -L .#${{ matrix.target }}
           nix run -L .#${{ matrix.target }} -- --version
-      - name: Upload release artifact (tarball)
+      - name: Upload release artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: "himalaya.${{ matrix.target }}.tgz"
-          path: result/himalaya.tgz
-      - name: Upload release artifact (zip)
-        uses: actions/upload-artifact@v4
-        with:
-          name: "himalaya.${{ matrix.target }}.zip"
-          path: result/himalaya.zip
+          name: "himalaya.${{ matrix.target }}"
+          path: |
+            result/bin/himalaya*
+            result/bin/share
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -85,6 +85,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
     message.send.backend.auth.method = "xoauth2"
     ```
 
+### Fixed
+
+- Fixed pre-release archives issue. [#492]
+
 ## [1.0.0-beta.4] - 2024-04-16
 
 ### Added
@@ -888,3 +892,5 @@ Few major concepts changed:
 [0.2.1]: https://github.com/soywod/himalaya/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/soywod/himalaya/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/soywod/himalaya/releases/tag/v0.1.0
+
+[#492]: https://github.com/pimalaya/himalaya/issues/492
diff --git a/flake.nix b/flake.nix
@@ -37,7 +37,7 @@
           aarch64-linux = rec {
             rustTarget = "aarch64-unknown-linux-musl";
             runner = { pkgs, himalaya }: "${pkgs.qemu}/bin/qemu-aarch64 ${himalaya}";
-            mkPackage = { system, pkgs }: package:
+            mkPackage = { system, ... }: package:
               let
                 inherit (mkPkgsCross system rustTarget) stdenv;
                 cc = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
@@ -53,7 +53,7 @@
             runner = { pkgs, himalaya }:
               let wine = pkgs.wine.override { wineBuild = "wine64"; };
               in "${wine}/bin/wine64 ${himalaya}.exe";
-            mkPackage = { system, pkgs }: package:
+            mkPackage = { pkgs, ... }: package:
               let
                 inherit (pkgs.pkgsCross.mingwW64) stdenv windows;
                 cc = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
@@ -148,11 +148,12 @@
               ${runner} completion fish > ./share/completions/himalaya.fish
               ${runner} completion powershell > ./share/completions/himalaya.powershell
               ${runner} completion zsh > ./share/completions/himalaya.zsh
+
               tar -czf himalaya.tgz himalaya* share
-              ${pkgs.zip}/bin/zip -r himalaya.zip himalaya* share
+              mv himalaya.tgz ../
 
-              mv share ../
-              mv himalaya.tgz himalaya.zip ../
+              ${pkgs.zip}/bin/zip -r himalaya.zip himalaya* share
+              mv himalaya.zip ../
             '';
           };
         in