guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 732cdd07e8b770dbf06dcb076dda67aca000782d
Author: Sharlatan Hellseher <[email protected]>
AuthorDate: Fri Jul 24 15:10:53 2026 +0100
gnu: forgejo-runner: Update to 12.13.0.
* gnu/packages/ci.scm (go-code-forgejo-org-forgejo-runner-v12):
[arguments] <#:build-flags>: Set version.
(forgejo-runner): Inherit from go-code-forgejo-org-forgejo-runner-v12,
which updates it to 12.13.0.
[native-inputs]: Due to inheritance - remove
go-code-gitea-io-actions-proto-go-ping,
go-code-gitea-io-actions-proto-go-runner, go-github-com-avast-retry-go,
go-github-com-nektos-act, and go-gopkg-in-yaml-v3; add
git-minimal/pinned, go-code-forgejo-org-forgejo-actions-proto,
go-dario-cat-mergo, go-github-com-containerd-errdefs,
go-github-com-creack-pty, go-github-com-distribution-reference,
go-github-com-djherbis-buffer, go-github-com-djherbis-nio-v3,
go-github-com-docker-cli, go-github-com-docker-docker,
go-github-com-docker-go-connections, go-github-com-gdgvda-cron,
go-github-com-gobwas-glob, go-github-com-google-go-cmp,
go-github-com-julienschmidt-httprouter,
go-github-com-kballard-go-shellquote, go-github-com-masterminds-semver,
go-github-com-moby-go-archive, go-github-com-moby-patternmatcher,
go-github-com-opencontainers-image-spec,
go-github-com-opencontainers-selinux, go-github-com-powerman-fileuri,
go-github-com-rhysd-actionlint, go-github-com-spf13-pflag,
go-github-com-stretchr-testify, go-github-com-timshannon-bolthold,
go-go-etcd-io-bbolt, go-go-yaml-in-yaml-v3, and go-golang-org-x-sys.
[license]: Changed from Expat (MIT) to GPLv3.
---
gnu/packages/ci.scm | 75 ++++++++++++++++-------------------------------------
1 file changed, 22 insertions(+), 53 deletions(-)
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm
index d8c2de9d2f..3ac6c77e73 100644
--- a/gnu/packages/ci.scm
+++ b/gnu/packages/ci.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2023 David Pflug <[email protected]>
;;; Copyright © 2025 David Thompson <[email protected]>
;;; Copyright © 2025-2026 Ludovic Courtès <[email protected]>
+;;; Copyright © 2026 Sharlatan Hellseher <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -35,6 +36,7 @@
#:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
@@ -310,6 +312,10 @@ reinventing them.")
;; source library to use in inputs for other packages.
#:skip-build? #f
#:import-path "code.forgejo.org/forgejo/runner/v12"
+ #:build-flags
+ #~(list (string-append "-ldflags=-X code.forgejo.org/"
+ "forgejo/runner/v12/internal/pkg/ver.version="
+ #$version))
#:embed-files #~(list ".*\\.json" ".*\\.js" ".*\\.sh")
#:test-flags
#~(list "-skip" (string-join
@@ -387,59 +393,22 @@ locally and act as a cache.")
(license l:gpl3)))
(define-public forgejo-runner
- (package
+ (package/inherit go-code-forgejo-org-forgejo-runner-v12
(name "forgejo-runner")
- (version "6.2.2")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://code.forgejo.org/forgejo/runner.git";)
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32 "0bdn1pk9ghbyd4i9hmk7rfhqdkz9l5w4wgrwiryg8qpwplb7j8mz"))))
- (build-system go-build-system)
(arguments
- (list
- #:install-source? #f
- #:import-path "gitea.com/gitea/act_runner"
- #:embed-files #~(list ".*\\.json" ".*\\.js" ".*\\.sh")
- #:test-flags
- #~(list "-skip" (string-join
- (list
- ;; Should be true.
- "Test_ping"
- ;; panic: runtime error: invalid memory address or nil
- ;; pointer dereference.
- "Test_runCreateRunnerFile")
- "|"))
- #:phases #~(modify-phases %standard-phases
- (add-after 'install 'rename-binary
- (lambda _
- (rename-file (string-append #$output "/bin/act_runner")
- (string-append #$output
"/bin/forgejo-runner")))))))
+ (substitute-keyword-arguments arguments
+ ((#:install-source? _ #t) #f)
+ ((#:skip-build? _ #t) #f)
+ ((#:tests? _ #t) #f)
+ ((#:phases phases '%standard-phases)
+ #~(modify-phases #$phases
+ (add-after 'install 'rename-binary
+ (lambda _
+ (with-directory-excursion (string-append #$output "/bin")
+ (rename-file "v12" "forgejo-runner"))))))))
(native-inputs
- (list go-code-gitea-io-actions-proto-go-ping
- go-code-gitea-io-actions-proto-go-runner
- go-connectrpc-com-connect
- go-github-com-avast-retry-go
- go-github-com-avast-retry-go-v4
- go-github-com-google-uuid
- go-github-com-joho-godotenv
- go-github-com-mattn-go-isatty
- go-github-com-nektos-act
- go-github-com-sirupsen-logrus
- go-github-com-spf13-cobra
- go-golang-org-x-term
- go-golang-org-x-time
- go-google-golang-org-protobuf
- go-gopkg-in-yaml-v3
- go-gotest-tools-v3))
- (home-page "https://code.forgejo.org/forgejo/runner";)
- (synopsis "Run continuous integration jobs for Forgejo")
- (description
- "Forgejo Runner is a daemon that connects to a Forgejo instance and runs
-jobs for continuous integration.")
- (license l:expat)))
-
+ (append
+ (package-native-inputs go-code-forgejo-org-forgejo-runner-v12)
+ (package-propagated-inputs go-code-forgejo-org-forgejo-runner-v12)))
+ (propagated-inputs '())
+ (inputs '())))
