Github messages for voidlinux
 help / color / mirror / Atom feed
From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups
Date: Mon, 15 Mar 2021 19:22:34 +0100	[thread overview]
Message-ID: <20210315182234.qK_CzaO1GVaB9JkaVgxRI85gabYGzhG5lNTfDKmLFRU@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29492@inbox.vuxu.org>

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

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages gitlab-subgroups
https://github.com/void-linux/void-packages/pull/29492

xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/29492.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gitlab-subgroups-29492.patch --]
[-- Type: text/x-diff, Size: 1277 bytes --]

From c2fb907bf7753b69972e94962680bbd990654bcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Mon, 15 Mar 2021 19:12:50 +0100
Subject: [PATCH] xbps-src/shutils/update_check.sh: change gitlab check to
 handle subgroups

The `/-/` sequence is always between e.g. archive and the repo path,
so this should work reliably for distfiles.
If gitlab is used only as a homepage, this still wroks if homepage
points to the base repo (which it usually does)
---
 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 57077de58b81..a8bca326f89c 100644
--- a/common/xbps-src/shutils/update_check.sh
+++ b/common/xbps-src/shutils/update_check.sh
@@ -123,7 +123,7 @@ update_check() {
                 url="https://github.com/$pkgurlname/tags"
                 rx='/archive/(v?|\Q'"$pkgname"'\E-)?\K[\d\.]+(?=\.tar\.gz")';;
             *//gitlab.*)
-                pkgurlname="$(printf %s "$url" | cut -d/ -f1-5)"
+                pkgurlname="$(printf %s "$url" | sed 's%/-/*%%g')"
                 url="$pkgurlname/tags"
                 rx='/archive/[^/]+/\Q'"$pkgname"'\E-v?\K[\d\.]+(?=\.tar\.gz")';;
             *bitbucket.org*)

  reply	other threads:[~2021-03-15 18:22 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-15 18:15 [PR PATCH] " Johnnynator
2021-03-15 18:22 ` Johnnynator [this message]
2021-03-15 21:19 ` Chocimier
2022-05-09  2:13 ` [WiP] " github-actions
2022-05-14 13:33 ` [PR PATCH] [Merged]: " Chocimier
2022-05-14 13:42 ` Chocimier

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=20210315182234.qK_CzaO1GVaB9JkaVgxRI85gabYGzhG5lNTfDKmLFRU@z \
    --to=johnnynator@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).