diff options
| author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2026-07-24 15:10:53 +0100 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2026-07-24 17:08:48 +0100 |
| commit | 732cdd07e8b770dbf06dcb076dda67aca000782d (patch) | |
| tree | a120c81e7cf299c90b4c526ea5272daad3a86ad5 /gnu/packages/ci.scm | |
| parent | b9db194349fb78bc127c09227a67c580e5d72b59 (diff) | |
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.
Diffstat (limited to 'gnu/packages/ci.scm')
| -rw-r--r-- | gnu/packages/ci.scm | 75 |
1 files changed, 22 insertions, 53 deletions
diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index d8c2de9d2fa..3ac6c77e736 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | ;;; Copyright © 2023 David Pflug <david@pflug.io> | 9 | ;;; Copyright © 2023 David Pflug <david@pflug.io> |
| 10 | ;;; Copyright © 2025 David Thompson <davet@gnu.org> | 10 | ;;; Copyright © 2025 David Thompson <davet@gnu.org> |
| 11 | ;;; Copyright © 2025-2026 Ludovic Courtès <ludo@gnu.org> | 11 | ;;; Copyright © 2025-2026 Ludovic Courtès <ludo@gnu.org> |
| 12 | ;;; Copyright © 2026 Sharlatan Hellseher <sharlatanus@gmail.com> | ||
| 12 | ;;; | 13 | ;;; |
| 13 | ;;; This file is part of GNU Guix. | 14 | ;;; This file is part of GNU Guix. |
| 14 | ;;; | 15 | ;;; |
| @@ -35,6 +36,7 @@ | |||
| 35 | #:use-module (guix gexp) | 36 | #:use-module (guix gexp) |
| 36 | #:use-module (guix git-download) | 37 | #:use-module (guix git-download) |
| 37 | #:use-module (guix packages) | 38 | #:use-module (guix packages) |
| 39 | #:use-module (guix utils) | ||
| 38 | #:use-module (gnu packages) | 40 | #:use-module (gnu packages) |
| 39 | #:use-module (gnu packages autotools) | 41 | #:use-module (gnu packages autotools) |
| 40 | #:use-module (gnu packages base) | 42 | #:use-module (gnu packages base) |
| @@ -310,6 +312,10 @@ reinventing them.") | |||
| 310 | ;; source library to use in inputs for other packages. | 312 | ;; source library to use in inputs for other packages. |
| 311 | #:skip-build? #f | 313 | #:skip-build? #f |
| 312 | #:import-path "code.forgejo.org/forgejo/runner/v12" | 314 | #:import-path "code.forgejo.org/forgejo/runner/v12" |
| 315 | #:build-flags | ||
| 316 | #~(list (string-append "-ldflags=-X code.forgejo.org/" | ||
| 317 | "forgejo/runner/v12/internal/pkg/ver.version=" | ||
| 318 | #$version)) | ||
| 313 | #:embed-files #~(list ".*\\.json" ".*\\.js" ".*\\.sh") | 319 | #:embed-files #~(list ".*\\.json" ".*\\.js" ".*\\.sh") |
| 314 | #:test-flags | 320 | #:test-flags |
| 315 | #~(list "-skip" (string-join | 321 | #~(list "-skip" (string-join |
| @@ -387,59 +393,22 @@ locally and act as a cache.") | |||
| 387 | (license l:gpl3))) | 393 | (license l:gpl3))) |
| 388 | 394 | ||
| 389 | (define-public forgejo-runner | 395 | (define-public forgejo-runner |
| 390 | (package | 396 | (package/inherit go-code-forgejo-org-forgejo-runner-v12 |
| 391 | (name "forgejo-runner") | 397 | (name "forgejo-runner") |
| 392 | (version "6.2.2") | ||
| 393 | (source | ||
| 394 | (origin | ||
| 395 | (method git-fetch) | ||
| 396 | (uri (git-reference | ||
| 397 | (url "https://code.forgejo.org/forgejo/runner.git") | ||
| 398 | (commit (string-append "v" version)))) | ||
| 399 | (file-name (git-file-name name version)) | ||
| 400 | (sha256 | ||
| 401 | (base32 "0bdn1pk9ghbyd4i9hmk7rfhqdkz9l5w4wgrwiryg8qpwplb7j8mz")))) | ||
| 402 | (build-system go-build-system) | ||
| 403 | (arguments | 398 | (arguments |
| 404 | (list | 399 | (substitute-keyword-arguments arguments |
| 405 | #:install-source? #f | 400 | ((#:install-source? _ #t) #f) |
| 406 | #:import-path "gitea.com/gitea/act_runner" | 401 | ((#:skip-build? _ #t) #f) |
| 407 | #:embed-files #~(list ".*\\.json" ".*\\.js" ".*\\.sh") | 402 | ((#:tests? _ #t) #f) |
| 408 | #:test-flags | 403 | ((#:phases phases '%standard-phases) |
| 409 | #~(list "-skip" (string-join | 404 | #~(modify-phases #$phases |
| 410 | (list | 405 | (add-after 'install 'rename-binary |
| 411 | ;; Should be true. | 406 | (lambda _ |
| 412 | "Test_ping" | 407 | (with-directory-excursion (string-append #$output "/bin") |
| 413 | ;; panic: runtime error: invalid memory address or nil | 408 | (rename-file "v12" "forgejo-runner")))))))) |
| 414 | ;; pointer dereference. | ||
| 415 | "Test_runCreateRunnerFile") | ||
| 416 | "|")) | ||
| 417 | #:phases #~(modify-phases %standard-phases | ||
| 418 | (add-after 'install 'rename-binary | ||
| 419 | (lambda _ | ||
| 420 | (rename-file (string-append #$output "/bin/act_runner") | ||
| 421 | (string-append #$output "/bin/forgejo-runner"))))))) | ||
| 422 | (native-inputs | 409 | (native-inputs |
| 423 | (list go-code-gitea-io-actions-proto-go-ping | 410 | (append |
| 424 | go-code-gitea-io-actions-proto-go-runner | 411 | (package-native-inputs go-code-forgejo-org-forgejo-runner-v12) |
| 425 | go-connectrpc-com-connect | 412 | (package-propagated-inputs go-code-forgejo-org-forgejo-runner-v12))) |
| 426 | go-github-com-avast-retry-go | 413 | (propagated-inputs '()) |
| 427 | go-github-com-avast-retry-go-v4 | 414 | (inputs '()))) |
| 428 | go-github-com-google-uuid | ||
| 429 | go-github-com-joho-godotenv | ||
| 430 | go-github-com-mattn-go-isatty | ||
| 431 | go-github-com-nektos-act | ||
| 432 | go-github-com-sirupsen-logrus | ||
| 433 | go-github-com-spf13-cobra | ||
| 434 | go-golang-org-x-term | ||
| 435 | go-golang-org-x-time | ||
| 436 | go-google-golang-org-protobuf | ||
| 437 | go-gopkg-in-yaml-v3 | ||
| 438 | go-gotest-tools-v3)) | ||
| 439 | (home-page "https://code.forgejo.org/forgejo/runner") | ||
| 440 | (synopsis "Run continuous integration jobs for Forgejo") | ||
| 441 | (description | ||
| 442 | "Forgejo Runner is a daemon that connects to a Forgejo instance and runs | ||
| 443 | jobs for continuous integration.") | ||
| 444 | (license l:expat))) | ||
| 445 | |||
