From 05afc4a72a94b4eaf011aea476fd46b0450614b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 9 Jun 2025 14:40:55 +0900 Subject: [PATCH] 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 --- build-aux/update-guix-package.scm | 10 +++++----- 1 file 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 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2018 Ludovic Courtès -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2025 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -125,8 +125,8 @@ COMMIT. PROC receives the temporary directory file name as an argument." (lambda () (invoke "git" "worktree" "remove" "--force" tmp-directory)))))) -(define %savannah-guix-git-repo-push-url-regexp - "git.(savannah|sv).gnu.org:?/srv/git/guix.git \\(push\\)") +(define %guix-git-repo-push-url-regexp + "(git.guix.gnu.org|codeberg.org/guix)/guix.git \\(push\\)") (define-syntax-rule (with-input-pipe-to-string prog arg ...) (let* ((input-pipe (open-pipe* OPEN_READ prog arg ...)) @@ -138,12 +138,12 @@ COMMIT. PROC receives the temporary directory file name as an argument." (string-trim-both output))) (define (find-origin-remote) - "Find the name of the git remote with the Savannah Guix git repo URL." + "Find the name of the git remote with the Guix git repo URL." (and-let* ((remotes (string-split (with-input-pipe-to-string "git" "remote" "-v") #\newline)) (origin-entry (find (cut string-match - %savannah-guix-git-repo-push-url-regexp + %guix-git-repo-push-url-regexp <>) remotes))) (first (string-split origin-entry #\tab))))