robin/vbspview
1
0
Fork 0
mirror of https://codeberg.org/icewind/vbspview.git synced 2026-06-03 10:14:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

cross ci

Browse source
This commit is contained in:
Robin Appelman 2023-12-11 21:44:13 +01:00
commit 91e605cc57
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View file

@ -37,7 +37,7 @@ jobs:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: cachix/install-nix-action@v20 - uses: cachix/install-nix-action@v20
- id: set-matrix - id: set-matrix
run: echo "matrix={\"target\":$(nix eval --json ".#targets.x86_64-linux")}" | tee $GITHUB_OUTPUT run: echo "matrix=$(nix eval --json ".#matrix.x86_64-linux")" | tee $GITHUB_OUTPUT
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -56,5 +56,5 @@ jobs:
- run: nix build .#${{ matrix.target }} - run: nix build .#${{ matrix.target }}
- uses: actions/upload-artifact@v3 - uses: actions/upload-artifact@v3
with: with:
name: parser-${{ matrix.target }} name: vbspview-${{ matrix.asset_suffix }}
path: result/bin/vbspview path: result/bin/vbspview${{ matrix.artifact_suffix }}

14
flake.nix
View file

@ -35,8 +35,8 @@
hostTarget = pkgs.hostPlatform.config; hostTarget = pkgs.hostPlatform.config;
targets = ["x86_64-unknown-linux-musl" "x86_64-pc-windows-gnu" hostTarget]; targets = ["x86_64-unknown-linux-musl" "x86_64-pc-windows-gnu" hostTarget];
artifactForTarget = target: "parse_demo${cross-naersk'.execSufficForTarget target}"; artifactSuffixForTarget = cross-naersk'.execSufficForTarget;
assetNameForTarget = target: "parser-${builtins.replaceStrings ["-unknown" "-gnu" "-musl" "eabihf" "-pc"] ["" "" "" "" ""] target}${cross-naersk'.execSufficForTarget target}"; assetSuffixForTarget = target: "${builtins.replaceStrings ["-unknown" "-gnu" "-musl" "eabihf" "-pc"] ["" "" "" "" ""] target}${cross-naersk'.execSufficForTarget target}";
hostNaersk = naerskForTarget hostTarget; hostNaersk = naerskForTarget hostTarget;
cross-naersk' = pkgs.callPackage cross-naersk {inherit naersk;}; cross-naersk' = pkgs.callPackage cross-naersk {inherit naersk;};
@ -59,6 +59,14 @@
egl-wayland egl-wayland
libGL libGL
]; ];
buildMatrix = targets: {
include = builtins.map (target: {
inherit target;
artifact_suffix = artifactSuffixForTarget target;
asset_suffix = assetSuffixForTarget target;
}) targets;
};
in rec { in rec {
packages = (lib.attrsets.genAttrs targets (target:(cross-naersk'.buildPackage target) nearskOpt)) // rec { packages = (lib.attrsets.genAttrs targets (target:(cross-naersk'.buildPackage target) nearskOpt)) // rec {
vbspview = packages.${hostTarget}; vbspview = packages.${hostTarget};
@ -71,6 +79,8 @@
default = vbspview; default = vbspview;
}; };
matrix = buildMatrix targets;
inherit targets; inherit targets;
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {