Compare commits

...
17 Commits
Author SHA1 Message Date
Greg Hellings df82129c18 Give the release a name, also
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / build (ucrt) (push) Successful in 19s
build.yml / build (x86) (push) Successful in 19s
build.yml / release (push) Successful in 32s
2026-08-06 22:48:12 -05:00
Greg Hellings c79128dbcf Uses existing tools in builder image
build.yml / build (ucrt) (push) Successful in 22s
build.yml / build (x86) (push) Successful in 22s
build.yml / release (push) Successful in 30s
2026-08-06 22:44:09 -05:00
Greg Hellings ac26163234 Allow dirs without zips
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / build (x86) (push) Successful in 17s
build.yml / build (ucrt) (push) Successful in 19s
build.yml / release (push) Successful in 37s
2026-08-06 22:25:31 -05:00
Greg Hellings de5bf573cd Unpack artifacts
buildbot/nix-eval Build done.
build.yml / build (ucrt) (push) Successful in 13s
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / build (x86) (push) Successful in 18s
build.yml / release (push) Failing after 38s
2026-08-06 22:23:42 -05:00
Greg Hellings 3a3a0ba68b Use globs for files
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
build.yml / build (ucrt) (push) Successful in 19s
buildbot/nix-effects Build done.
build.yml / build (x86) (push) Successful in 28s
build.yml / release (push) Successful in 33s
2026-08-06 22:16:33 -05:00
Greg Hellings 980140c287 Include prefix for artifacts
build.yml / build (ucrt) (push) Successful in 18s
build.yml / build (x86) (push) Successful in 40s
build.yml / release (push) Successful in 41s
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
2026-08-06 22:12:48 -05:00
Greg Hellings 608cc25d19 Must include flake name
build.yml / build (x86) (push) Successful in 12s
build.yml / build (ucrt) (push) Successful in 41s
build.yml / release (push) Successful in 52s
2026-08-06 20:37:24 -05:00
Greg Hellings c2ac0cf586 Build on bare bare metal servers
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / build (x86) (push) Failing after 4s
build.yml / release (push) Canceled after 0s
build.yml / build (ucrt) (push) Canceled after 15m25s
* Allow builds to use cached Nix packages
* Prevent them from running on my VPS
* Possibly avoid re-downloading the SVN every single time?
2026-08-06 20:17:23 -05:00
Greg Hellings 49f5bf24ed Give builds a name
buildbot/nix-eval Build done.
buildbot/nix-build Build done.
buildbot/nix-effects Build done.
build.yml / build (ucrt) (push) Successful in 20m1s
build.yml / build (x86) (push) Successful in 19m55s
build.yml / release (push) Failing after 20s
2026-08-06 19:33:49 -05:00
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
4 changed files with 52 additions and 22 deletions
+33 -2
View File
@@ -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
+1 -1
View File
@@ -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
+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 \