beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-21 18:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

upload folder and exe instead of archive

Browse source
This commit is contained in:
Clément DOUIN 2024-10-30 16:21:35 +01:00
parent fecbae001c
commit 00e7148352
No known key found for this signature in database
GPG key ID: 353E4A18EE0FAB72
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/pre-release.yml vendored
View file

@ -39,13 +39,10 @@ jobs:
run: | run: |
nix build -L .#${{ matrix.target }} nix build -L .#${{ matrix.target }}
nix run -L .#${{ matrix.target }} -- --version nix run -L .#${{ matrix.target }} -- --version
- name: Upload release artifact (tarball) - name: Upload release artifacts
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: "himalaya.${{ matrix.target }}.tgz" name: "himalaya.${{ matrix.target }}"
path: result/himalaya.tgz path: |
- name: Upload release artifact (zip) result/bin/himalaya*
uses: actions/upload-artifact@v4 result/bin/share
with:
name: "himalaya.${{ matrix.target }}.zip"
path: result/himalaya.zip

9
flake.nix
View file

@ -37,7 +37,7 @@
aarch64-linux = rec { aarch64-linux = rec {
rustTarget = "aarch64-unknown-linux-musl"; rustTarget = "aarch64-unknown-linux-musl";
runner = { pkgs, himalaya }: "${pkgs.qemu}/bin/qemu-aarch64 ${himalaya}"; runner = { pkgs, himalaya }: "${pkgs.qemu}/bin/qemu-aarch64 ${himalaya}";
mkPackage = { system, pkgs }: package: mkPackage = { system, ... }: package:
let let
inherit (mkPkgsCross system rustTarget) stdenv; inherit (mkPkgsCross system rustTarget) stdenv;
cc = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cc = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
@ -53,7 +53,7 @@
runner = { pkgs, himalaya }: runner = { pkgs, himalaya }:
let wine = pkgs.wine.override { wineBuild = "wine64"; }; let wine = pkgs.wine.override { wineBuild = "wine64"; };
in "${wine}/bin/wine64 ${himalaya}.exe"; in "${wine}/bin/wine64 ${himalaya}.exe";
mkPackage = { system, pkgs }: package: mkPackage = { pkgs, ... }: package:
let let
inherit (pkgs.pkgsCross.mingwW64) stdenv windows; inherit (pkgs.pkgsCross.mingwW64) stdenv windows;
cc = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc"; cc = "${stdenv.cc}/bin/${stdenv.cc.targetPrefix}cc";
@ -148,11 +148,14 @@
${runner} completion fish > ./share/completions/himalaya.fish ${runner} completion fish > ./share/completions/himalaya.fish
${runner} completion powershell > ./share/completions/himalaya.powershell ${runner} completion powershell > ./share/completions/himalaya.powershell
${runner} completion zsh > ./share/completions/himalaya.zsh ${runner} completion zsh > ./share/completions/himalaya.zsh
tar -czf himalaya.tgz himalaya* share tar -czf himalaya.tgz himalaya* share
mv himalaya.tgz ../
${pkgs.zip}/bin/zip -r himalaya.zip himalaya* share ${pkgs.zip}/bin/zip -r himalaya.zip himalaya* share
mv himalaya.zip ../
mv share ../ mv share ../
mv himalaya.tgz himalaya.zip ../
''; '';
}; };
in in