Compare commits

...
8 Commits
Author SHA1 Message Date
Greg Hellings f315b03580 Pin old download-artifact action
buildbot/nix-effects Build done.
build.yml / build (ucrt) (push) Successful in 7m24s
build.yml / build (x86) (push) Successful in 20m25s
build.yml / release (push) Successful in 21s
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
2026-08-06 09:30:21 -05:00
Greg Hellings faf9d4dd9d Use gitea release action
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / release (push) Failing after 20s
build.yml / build (ucrt) (push) Successful in 10m12s
build.yml / build (x86) (push) Successful in 6m54s
2026-08-06 08:22:37 -05:00
Greg Hellings d9b3838cbd Use gitea artifact actions
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / build (ucrt) (push) Successful in 8m6s
build.yml / build (x86) (push) Successful in 8m5s
build.yml / release (push) Failing after 19s
2026-08-06 08:12:33 -05:00
Greg Hellings 8de9f6eb71 Add arm for testing in the future
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / build (ucrt) (push) Failing after 8m58s
build.yml / build (x86) (push) Failing after 22m22s
build.yml / release (push) Skipped
2026-08-05 22:23:26 -05:00
Greg Hellings 002897dfdc Fix artifact path 2026-08-05 22:03:49 -05:00
Greg Hellings a50754a3cc Add release step to builds
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / build (ucrt) (push) Failing after 11m0s
build.yml / build (x86) (push) Failing after 11m8s
build.yml / release (push) Skipped
2026-08-05 22:01:36 -05:00
Greg Hellings 73b70b5bc7 Build target name fixing
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / build (x86) (push) Successful in 14m44s
build.yml / build (ucrt) (push) Successful in 14m46s
2026-08-05 14:03:15 -05:00
Greg Hellings 6c5f5b0de5 r3916 update 2026-08-05 09:11:03 -05:00
3 changed files with 38 additions and 20 deletions
+20 -1
View File
@@ -16,5 +16,24 @@ jobs:
- 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 }}"
- name: Upload artifact
uses: https://gitea.com/actions/gitea-upload-artifact@v7
with:
name: ${{ matrix.arch }}
path: "*.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
- name: Create release
uses: https://gitea.com/actions/gitea-release-action@v1
with:
files: |-
"*.tar.xz"
+13 -11
View File
@@ -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
View File
@@ -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 \