From feaad39ec715556b3471b5822b47ce33be850def Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 30 Nov 2024 20:27:10 +0100 Subject: [PATCH 1/6] forgejo-runner: 4.0.1 -> 5.0.3 Changelog: https://code.forgejo.org/forgejo/runner/src/branch/main/RELEASE-NOTES.md#5-0-3 Signed-off-by: Christoph Heiss --- pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 27a497470468..e05372eb254f 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "forgejo-runner"; - version = "4.0.1"; + version = "5.0.3"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-hG8gCohf+U8T9A9Abqey9upErJklbCp8HuzHQKFcu3E="; + hash = "sha256-c1s2n4s2LY4KvQrPZJpAnXzJCTe6Fbc0cf1plwHZPiA="; }; - vendorHash = "sha256-yRXI9/LVj4f7qFdScqfpL5WCsK+lJXa6yQmdbUhfrKY="; + vendorHash = "sha256-DQcVknodbVlHygJkrGSfVGPKXR9kLGeyivNjYmjtFNs="; ldflags = [ "-s" From 0d5bcfecb5f41758ab3780a258a87c9d56adc6ed Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 30 Nov 2024 20:30:49 +0100 Subject: [PATCH 2/6] forgejo-runner: enable package tests Signed-off-by: Christoph Heiss --- pkgs/by-name/fo/forgejo-runner/package.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index e05372eb254f..296f1bc6e42b 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -6,6 +6,13 @@ , nixosTests }: +let + # tests which assume network access in some form + disabledTests = [ + "Test_runCreateRunnerFile" + "Test_ping" + ]; +in buildGoModule rec { pname = "forgejo-runner"; version = "5.0.3"; @@ -26,7 +33,9 @@ buildGoModule rec { "-X gitea.com/gitea/act_runner/internal/pkg/ver.version=${src.rev}" ]; - doCheck = false; # Test try to lookup code.forgejo.org. + checkFlags = [ + "-skip ${lib.concatStringsSep "|" disabledTests}" + ]; passthru.tests = { inherit (nixosTests.forgejo) sqlite3; From e41fbfb28030b5e58d00cd5b0693d59af6072480 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 30 Nov 2024 20:34:02 +0100 Subject: [PATCH 3/6] forgejo-runner: use `versionCheckHook` for program version check Signed-off-by: Christoph Heiss --- pkgs/by-name/fo/forgejo-runner/package.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 296f1bc6e42b..4aa3a47351c0 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -1,9 +1,9 @@ -{ lib -, buildGoModule -, fetchFromGitea -, testers -, forgejo-runner -, nixosTests +{ + lib, + buildGoModule, + fetchFromGitea, + nixosTests, + versionCheckHook, }: let @@ -37,12 +37,13 @@ buildGoModule rec { "-skip ${lib.concatStringsSep "|" disabledTests}" ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; + versionCheckProgramArg = [ "--version" ]; + passthru.tests = { inherit (nixosTests.forgejo) sqlite3; - version = testers.testVersion { - package = forgejo-runner; - version = src.rev; - }; }; meta = with lib; { From ab91a69db187506f9a206db25e0a352725ae2a99 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 30 Nov 2024 20:36:48 +0100 Subject: [PATCH 4/6] forgejo-runner: use nix-update-script Signed-off-by: Christoph Heiss --- pkgs/by-name/fo/forgejo-runner/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 4aa3a47351c0..7b26b8faaced 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -4,6 +4,7 @@ fetchFromGitea, nixosTests, versionCheckHook, + nix-update-script, }: let @@ -42,8 +43,9 @@ buildGoModule rec { versionCheckProgram = "${placeholder "out"}/bin/${meta.mainProgram}"; versionCheckProgramArg = [ "--version" ]; - passthru.tests = { - inherit (nixosTests.forgejo) sqlite3; + passthru = { + updateScript = nix-update-script { }; + tests.sqlite3 = nixosTests.forgejo.sqlite3; }; meta = with lib; { From 6e03fe786addd8708651c8c6bab83fb6552ccd5b Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sat, 30 Nov 2024 20:37:12 +0100 Subject: [PATCH 5/6] forgejo-runner: add myself to maintainers Signed-off-by: Christoph Heiss --- pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 7b26b8faaced..d6aa039526ef 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -53,7 +53,11 @@ buildGoModule rec { homepage = "https://code.forgejo.org/forgejo/runner"; changelog = "https://code.forgejo.org/forgejo/runner/src/tag/${src.rev}/RELEASE-NOTES.md"; license = licenses.mit; - maintainers = with maintainers; [ kranzes emilylange ]; + maintainers = with maintainers; [ + kranzes + emilylange + christoph-heiss + ]; mainProgram = "act_runner"; }; } From 8540239004a2b79c094e165d18acd588e422688c Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Sun, 1 Dec 2024 21:06:34 +0100 Subject: [PATCH 6/6] forgejo-runner: only run passthru tests on linux Signed-off-by: Christoph Heiss --- pkgs/by-name/fo/forgejo-runner/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index d6aa039526ef..3835a1a062fc 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -1,4 +1,5 @@ { + stdenv, lib, buildGoModule, fetchFromGitea, @@ -45,7 +46,9 @@ buildGoModule rec { passthru = { updateScript = nix-update-script { }; - tests.sqlite3 = nixosTests.forgejo.sqlite3; + tests = lib.optionalAttrs stdenv.hostPlatform.isLinux { + sqlite3 = nixosTests.forgejo.sqlite3; + }; }; meta = with lib; {