diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-06-09 14:40:55 +0900 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2025-06-09 15:39:42 +0900 |
| commit | 05afc4a72a94b4eaf011aea476fd46b0450614b4 (patch) | |
| tree | b5a448dafc0a6701542d0832ffb76412c3c4662a | |
| parent | 2d418933a46a92a545ccebe629470af0fc019c4b (diff) | |
build: Update push URL regexp for 'update-guix-package' script.
* build-aux/update-guix-package.scm
(%savannah-guix-git-repo-push-url-regexp): Rename to...
(%guix-git-repo-push-url-regexp): Update regexp.
(find-origin-remote): Adjust accordingly.
Change-Id: I3e6f1a1fb0b6921f7c263e9b93a47ac602b92f0d
| -rw-r--r-- | build-aux/update-guix-package.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/build-aux/update-guix-package.scm b/build-aux/update-guix-package.scm index 9fe6c201ccb..b86fbeec87d 100644 --- a/build-aux/update-guix-package.scm +++ b/build-aux/update-guix-package.scm | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2017, 2018 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> | 3 | ;;; Copyright © 2020, 2025 Maxim Cournoyer <maxim.cournoyer@gmail.com> |
| 4 | ;;; | 4 | ;;; |
| 5 | ;;; This file is part of GNU Guix. | 5 | ;;; This file is part of GNU Guix. |
| 6 | ;;; | 6 | ;;; |
| @@ -125,8 +125,8 @@ COMMIT. PROC receives the temporary directory file name as an argument." | |||
| 125 | (lambda () | 125 | (lambda () |
| 126 | (invoke "git" "worktree" "remove" "--force" tmp-directory)))))) | 126 | (invoke "git" "worktree" "remove" "--force" tmp-directory)))))) |
| 127 | 127 | ||
| 128 | (define %savannah-guix-git-repo-push-url-regexp | 128 | (define %guix-git-repo-push-url-regexp |
| 129 | "git.(savannah|sv).gnu.org:?/srv/git/guix.git \\(push\\)") | 129 | "(git.guix.gnu.org|codeberg.org/guix)/guix.git \\(push\\)") |
| 130 | 130 | ||
| 131 | (define-syntax-rule (with-input-pipe-to-string prog arg ...) | 131 | (define-syntax-rule (with-input-pipe-to-string prog arg ...) |
| 132 | (let* ((input-pipe (open-pipe* OPEN_READ prog arg ...)) | 132 | (let* ((input-pipe (open-pipe* OPEN_READ prog arg ...)) |
| @@ -138,12 +138,12 @@ COMMIT. PROC receives the temporary directory file name as an argument." | |||
| 138 | (string-trim-both output))) | 138 | (string-trim-both output))) |
| 139 | 139 | ||
| 140 | (define (find-origin-remote) | 140 | (define (find-origin-remote) |
| 141 | "Find the name of the git remote with the Savannah Guix git repo URL." | 141 | "Find the name of the git remote with the Guix git repo URL." |
| 142 | (and-let* ((remotes (string-split (with-input-pipe-to-string | 142 | (and-let* ((remotes (string-split (with-input-pipe-to-string |
| 143 | "git" "remote" "-v") | 143 | "git" "remote" "-v") |
| 144 | #\newline)) | 144 | #\newline)) |
| 145 | (origin-entry (find (cut string-match | 145 | (origin-entry (find (cut string-match |
| 146 | %savannah-guix-git-repo-push-url-regexp | 146 | %guix-git-repo-push-url-regexp |
| 147 | <>) | 147 | <>) |
| 148 | remotes))) | 148 | remotes))) |
| 149 | (first (string-split origin-entry #\tab)))) | 149 | (first (string-split origin-entry #\tab)))) |
