From c3211c84244bb17e9cd6388dd6b50554a5f73684 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 5 Dec 2025 22:10:04 +0100 Subject: [PATCH] forgejo-runner: 11.3.1 -> 12.2.0 Changelog: - https://code.forgejo.org/forgejo/runner/releases/tag/v12.0.0 - https://code.forgejo.org/forgejo/runner/releases/tag/v12.0.1 - https://code.forgejo.org/forgejo/runner/releases/tag/v12.1.0 - https://code.forgejo.org/forgejo/runner/releases/tag/v12.1.1 - https://code.forgejo.org/forgejo/runner/releases/tag/v12.1.2 - https://code.forgejo.org/forgejo/runner/releases/tag/v12.2.0 --- pkgs/by-name/fo/forgejo-runner/package.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index ca4b73b1cc57..c994cc7efa7d 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -6,6 +6,7 @@ nixosTests, versionCheckHook, nix-update-script, + git, }: let @@ -17,7 +18,7 @@ let # The following tests were introduced in 9.x with the inclusion of act # the pkgs/by-name/ac/act/package.nix just sets doCheck = false; - # Requires running docker install + # Requires running Docker daemon "TestDocker" "TestJobExecutor" "TestRunner" @@ -29,7 +30,7 @@ let # Reaches out to different websites "TestFindGitRemoteURL" "TestGitFindRef" - "TestGitCloneExecutor" + "TestClone" "TestCloneIfRequired" "TestActionCache" "TestRunContext_GetGitHubContext" @@ -46,17 +47,17 @@ let in buildGoModule rec { pname = "forgejo-runner"; - version = "11.3.1"; + version = "12.2.0"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${version}"; - hash = "sha256-jvHnTCkRvYaejeCiPpr18ldEmxcAkrEIaOLVVBY11eg="; + hash = "sha256-UzBRIa+mhynJDYHzssApMPyLeHdFVSAZ6SZtPbtJpB4="; }; - vendorHash = "sha256-7Ybh5qzkqT3CvGtRXiPkc5ShTYGlyvckTxg4EFagM/c="; + vendorHash = "sha256-ReGxoPvW4G6DbFfR2OeeT3tupZkpLpX80zK824oeyVg="; # See upstream Makefile # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile @@ -68,15 +69,17 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X code.forgejo.org/forgejo/runner/v11/internal/pkg/ver.version=${src.rev}" + "-X code.forgejo.org/forgejo/runner/v12/internal/pkg/ver.version=${src.rev}" ]; checkFlags = [ "-skip ${lib.concatStringsSep "|" disabledTests}" ]; + nativeCheckInputs = [ git ]; + postInstall = '' - # fix up go-specific executable naming derived from package name, upstream + # Fix up go-specific executable naming derived from package name, upstream # also calls it `forgejo-runner` mv $out/bin/runner $out/bin/forgejo-runner # provide old binary name for compatibility