Compare commits
17
Commits
688e63ce04
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
df82129c18 | ||
|
|
c79128dbcf | ||
|
|
ac26163234 | ||
|
|
de5bf573cd | ||
|
|
3a3a0ba68b | ||
|
|
980140c287 | ||
|
|
608cc25d19 | ||
|
|
c2ac0cf586 | ||
|
|
49f5bf24ed | ||
|
|
f315b03580 | ||
|
|
faf9d4dd9d | ||
|
|
d9b3838cbd | ||
|
|
8de9f6eb71 | ||
|
|
002897dfdc | ||
|
|
a50754a3cc | ||
|
|
73b70b5bc7 | ||
|
|
6c5f5b0de5 |
@@ -9,12 +9,43 @@
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
runs-on: nix-latest
|
runs-on: bare-metal
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
arch:
|
arch:
|
||||||
- x86
|
- x86
|
||||||
- ucrt
|
- ucrt
|
||||||
steps:
|
steps:
|
||||||
|
- uses: actions/checkout@v6
|
||||||
- name: Build
|
- name: Build
|
||||||
run: nix run -L "${{ matrix.arch }}"
|
run: |-
|
||||||
|
nix run -L ".#${{ matrix.arch }}"
|
||||||
|
mv sword.tar.xz sword-${{ matrix.arch }}.tar.xz
|
||||||
|
- name: Upload artifact
|
||||||
|
uses: https://gitea.com/actions/gitea-upload-artifact@v7
|
||||||
|
with:
|
||||||
|
name: ${{ matrix.arch }}
|
||||||
|
path: sword-${{ matrix.arch }}.tar.xz
|
||||||
|
|
||||||
|
release:
|
||||||
|
needs: build
|
||||||
|
runs-on: nix-latest
|
||||||
|
if: github.ref == 'refs/heads/main'
|
||||||
|
steps:
|
||||||
|
- name: Download artifacts
|
||||||
|
uses: https://gitea.com/actions/download-artifact@v3-node20
|
||||||
|
- id: date
|
||||||
|
name: Generate date
|
||||||
|
run: |-
|
||||||
|
echo "DATE=$(date +'%Y-%m-%d-%H')" >> "$GITHUB_OUTPUT"
|
||||||
|
for d in $(find -maxdepth 1 -type d); do
|
||||||
|
unzip -d . "${d}"/*.zip || true
|
||||||
|
done
|
||||||
|
ls -lR
|
||||||
|
- name: Create release
|
||||||
|
uses: https://gitea.com/actions/gitea-release-action@v1
|
||||||
|
with:
|
||||||
|
name: ${{ steps.date.outputs.DATE }}
|
||||||
|
tag_name: ${{ steps.date.outputs.DATE }}
|
||||||
|
files: |-
|
||||||
|
*.tar.xz
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
check:
|
check:
|
||||||
runs-on: nix-latest
|
runs-on: bare-metal
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
- name: Flake check
|
- name: Flake check
|
||||||
|
|||||||
@@ -32,14 +32,16 @@
|
|||||||
perSystem =
|
perSystem =
|
||||||
{ pkgs, self', ... }@inputs':
|
{ pkgs, self', ... }@inputs':
|
||||||
{
|
{
|
||||||
_module.args.pkgs = import inputs.nixpkgs {
|
_module.args = {
|
||||||
inherit (inputs') system;
|
pkgs = import inputs.nixpkgs {
|
||||||
overlays = [
|
inherit (inputs') system;
|
||||||
(_: p: {
|
overlays = [
|
||||||
nghttp3 = p.nghttp3.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; };
|
(_: p: {
|
||||||
ngtcp2 = p.ngtcp2.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; };
|
nghttp3 = p.nghttp3.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; };
|
||||||
})
|
ngtcp2 = p.ngtcp2.overrideAttrs { meta.platforms = pkgs.lib.platforms.all; };
|
||||||
];
|
})
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
devShells.default = pkgs.mkShell {
|
devShells.default = pkgs.mkShell {
|
||||||
@@ -79,8 +81,8 @@
|
|||||||
(win.sword.overrideAttrs {
|
(win.sword.overrideAttrs {
|
||||||
src = pkgs.fetchsvn {
|
src = pkgs.fetchsvn {
|
||||||
url = "https://svn.crosswire.org/svn/sword/trunk";
|
url = "https://svn.crosswire.org/svn/sword/trunk";
|
||||||
rev = "3914";
|
rev = "3916";
|
||||||
hash = "sha256-yqZtUb86KILTYcshe/qim5+H57ktKlH3Uiic6KDKnrQ=";
|
hash = "sha256-eucivqgAeNpcwsyn2Il0+eX1X6rJHJQo1jF+jzE3IxE=";
|
||||||
};
|
};
|
||||||
patches = [ ];
|
patches = [ ];
|
||||||
}).override
|
}).override
|
||||||
@@ -115,7 +117,7 @@
|
|||||||
default = tar mingwW64;
|
default = tar mingwW64;
|
||||||
x86 = tar mingwW64;
|
x86 = tar mingwW64;
|
||||||
ucrt = tar ucrt64;
|
ucrt = tar ucrt64;
|
||||||
#ucrtAarch = tar ucrtAarch64;
|
arm = tar ucrtAarch64;
|
||||||
update = pkgs.callPackage ./update.nix { };
|
update = pkgs.callPackage ./update.nix { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
+5
-8
@@ -2,7 +2,7 @@
|
|||||||
writeShellApplication,
|
writeShellApplication,
|
||||||
gnugrep,
|
gnugrep,
|
||||||
gnused,
|
gnused,
|
||||||
nix-prefetch,
|
nix-prefetch-svn,
|
||||||
subversion,
|
subversion,
|
||||||
}:
|
}:
|
||||||
writeShellApplication {
|
writeShellApplication {
|
||||||
@@ -10,7 +10,7 @@ writeShellApplication {
|
|||||||
runtimeInputs = [
|
runtimeInputs = [
|
||||||
gnugrep
|
gnugrep
|
||||||
gnused
|
gnused
|
||||||
nix-prefetch
|
nix-prefetch-svn
|
||||||
subversion
|
subversion
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -25,12 +25,9 @@ writeShellApplication {
|
|||||||
else
|
else
|
||||||
echo "DO_UPDATE=1"
|
echo "DO_UPDATE=1"
|
||||||
fi
|
fi
|
||||||
hash="$(nix-prefetch \
|
hash="$(nix-prefetch-svn \
|
||||||
--check-store \
|
"$url" \
|
||||||
--option extra-experimental-features flakes \
|
"$new_rev" \
|
||||||
fetchsvn \
|
|
||||||
--url "$url" \
|
|
||||||
--rev "$new_rev" \
|
|
||||||
)"
|
)"
|
||||||
echo "HASH=$hash"
|
echo "HASH=$hash"
|
||||||
sed -i flake.nix \
|
sed -i flake.nix \
|
||||||
|
|||||||
Reference in New Issue
Block a user