Github messages for voidlinux
 help / color / mirror / Atom feed
From: JamiKettunen <JamiKettunen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] Fix GitLab update-checks
Date: Tue, 23 May 2023 14:49:43 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44043@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]

There is a new pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages fix-gitlab-update-check
https://github.com/void-linux/void-packages/pull/44043

Fix GitLab update-checks
<!-- Uncomment relevant sections and delete options which are not applicable -->
Something changed recently (in GitLab 16.1?) and it now requires the `-/` similar to the archive URL.

Fixed (`GitLab Enterprise Edition 16.1.0-pre 563cf02c7b5`):
```
XBPS_UPDATE_CHECK_VERBOSE=1 ./xbps-src update-check corectrl
```
Unchanged (`GitLab Community Edition 15.11.4`):
```
XBPS_UPDATE_CHECK_VERBOSE=1 ./xbps-src update-check wlroots
```

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/44043.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fix-gitlab-update-check-44043.patch --]
[-- Type: text/x-diff, Size: 2051 bytes --]

From 95b1de07ebee7b9d90db191f8e9a510fe7b40525 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Tue, 23 May 2023 15:16:52 +0300
Subject: [PATCH 1/2] update-check: fix tags URL for GitLab

Something changed recently (in GitLab 16.1?) and it now requires the
'-/' similar to the archive URL.

Fixed (GitLab Enterprise Edition 16.1.0-pre 563cf02c7b5):
  XBPS_UPDATE_CHECK_VERBOSE=1 ./xbps-src update-check corectrl
Unchanged (GitLab Community Edition 15.11.4):
  XBPS_UPDATE_CHECK_VERBOSE=1 ./xbps-src update-check wlroots
---
 common/xbps-src/shutils/update_check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/xbps-src/shutils/update_check.sh b/common/xbps-src/shutils/update_check.sh
index cd3bb369bdb3..e656cf06fbcc 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -136,7 +136,7 @@ update_check() {
                     */-/*) pkgurlname="$(printf %s "$url" | sed -e 's%/-/.*%%g; s%/$%%')";;
                     *) pkgurlname="$(printf %s "$url" | cut -d / -f 1-5)";;
                 esac
-                url="$pkgurlname/tags"
+                url="$pkgurlname/-/tags"
                 rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d.]+(?=\.tar\.gz")';;
             *bitbucket.org*)
                 pkgurlname="$(printf %s "$url" | cut -d/ -f4,5)"

From c613620ba546b865758ffe99f7a37cd59f45ee70 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Tue, 23 May 2023 15:43:34 +0300
Subject: [PATCH 2/2] goimapnotify: remove redundant update file

The update-check defaults work just fine.
---
 srcpkgs/goimapnotify/update | 2 --
 1 file changed, 2 deletions(-)
 delete mode 100644 srcpkgs/goimapnotify/update

diff --git a/srcpkgs/goimapnotify/update b/srcpkgs/goimapnotify/update
deleted file mode 100644
index b9a4e2b6728e..000000000000
--- a/srcpkgs/goimapnotify/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://gitlab.com/shackra/goimapnotify/-/tags/"
-pattern="goimapnotify-\K[\d.]*(?=\.tar\.gz)"

             reply	other threads:[~2023-05-23 12:49 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-05-23 12:49 JamiKettunen [this message]
2023-05-23 13:22 ` icp1994
2023-05-23 15:31 ` [PR PATCH] [Closed]: " JamiKettunen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-44043@inbox.vuxu.org \
    --to=jamikettunen@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).