Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups
@ 2021-03-15 18:15 Johnnynator
  2021-03-15 18:22 ` [PR PATCH] [Updated] " Johnnynator
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Johnnynator @ 2021-03-15 18:15 UTC (permalink / raw)
  To: ml

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

There is a new 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: 1256 bytes --]

From 38fe26e2021434697c3c25adce0d9848f87c1610 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.
Not sure if we have packages that depend on using gitlab repo as homepage
for a version check
---
 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*)

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Updated] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups
  2021-03-15 18:15 [PR PATCH] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups Johnnynator
@ 2021-03-15 18:22 ` Johnnynator
  2021-03-15 21:19 ` Chocimier
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Johnnynator @ 2021-03-15 18:22 UTC (permalink / raw)
  To: ml

[-- 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*)

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups
  2021-03-15 18:15 [PR PATCH] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups Johnnynator
  2021-03-15 18:22 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-03-15 21:19 ` Chocimier
  2022-05-09  2:13 ` [WiP] " github-actions
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2021-03-15 21:19 UTC (permalink / raw)
  To: ml

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/29492#issuecomment-799759328

Comment:
This breaks a lot, `printf %s "$url" | sed 's%/-/.*%%g' | sed 's%/$%%'` is better but still breaks old urls without dashes like abootimg or sane. Their urls would need to be updated if they updated gitlab.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [WiP] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups
  2021-03-15 18:15 [PR PATCH] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups Johnnynator
  2021-03-15 18:22 ` [PR PATCH] [Updated] " Johnnynator
  2021-03-15 21:19 ` Chocimier
@ 2022-05-09  2:13 ` github-actions
  2022-05-14 13:33 ` [PR PATCH] [Merged]: " Chocimier
  2022-05-14 13:42 ` Chocimier
  4 siblings, 0 replies; 6+ messages in thread
From: github-actions @ 2022-05-09  2:13 UTC (permalink / raw)
  To: ml

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/29492#issuecomment-1120562386

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PR PATCH] [Merged]: [WiP] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups
  2021-03-15 18:15 [PR PATCH] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups Johnnynator
                   ` (2 preceding siblings ...)
  2022-05-09  2:13 ` [WiP] " github-actions
@ 2022-05-14 13:33 ` Chocimier
  2022-05-14 13:42 ` Chocimier
  4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2022-05-14 13:33 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

[WiP] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups
https://github.com/void-linux/void-packages/pull/29492

Description:
<!-- 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
-->


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [WiP] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups
  2021-03-15 18:15 [PR PATCH] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups Johnnynator
                   ` (3 preceding siblings ...)
  2022-05-14 13:33 ` [PR PATCH] [Merged]: " Chocimier
@ 2022-05-14 13:42 ` Chocimier
  4 siblings, 0 replies; 6+ messages in thread
From: Chocimier @ 2022-05-14 13:42 UTC (permalink / raw)
  To: ml

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/29492#issuecomment-1126718466

Comment:
Merged with additional patch to handle both old and new style urls.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-05-14 13:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-15 18:15 [PR PATCH] xbps-src/shutils/update_check.sh: change gitlab check to handle subgroups Johnnynator
2021-03-15 18:22 ` [PR PATCH] [Updated] " Johnnynator
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

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).