* [PR PATCH] Yq alternatives
@ 2022-07-15 8:21 MarleDK
2022-07-15 8:24 ` [PR PATCH] [Updated] " MarleDK
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: MarleDK @ 2022-07-15 8:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
There is a new pull request by MarleDK against master on the void-packages repository
https://github.com/MarleDK/void-packages yq-alternatives
https://github.com/void-linux/void-packages/pull/38081
Yq alternatives
#### Testing the changes
- I tested the changes in this PR: **briefly**
- I tested by installing both `yq` and `yq-go`, and changed the alternative, to see if it changed what `yq` would run
A patch file from https://github.com/void-linux/void-packages/pull/38081.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yq-alternatives-38081.patch --]
[-- Type: text/x-diff, Size: 1819 bytes --]
From b2b344e8159e14458fe93de0abc8de2bf3ac725b Mon Sep 17 00:00:00 2001
From: Jakob Rydhof <jry@famly.co>
Date: Fri, 15 Jul 2022 10:17:07 +0200
Subject: [PATCH 1/2] yq: define yq alternative
---
srcpkgs/yq/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template
index b775674672ac..a1d482d21fc3 100644
--- a/srcpkgs/yq/template
+++ b/srcpkgs/yq/template
@@ -1,7 +1,7 @@
# Template file for 'yq'
pkgname=yq
version=3.0.1
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
makedepends="python3-yaml"
@@ -14,6 +14,8 @@ homepage="https://github.com/kislyuk/yq"
distfiles="${PYPI_SITE}/y/yq/yq-${version}.tar.gz"
checksum=a5e61078facd7ee4222f4346b5b50c4e9cea5e9d3330f074b5ea2c203bf639b1
+alternatives="yq:yq:/usr/bin/yq"
+
do_check() {
python3 test/test.py
}
From cfa871a5a77a27e4b87f393f560959efc08c995c Mon Sep 17 00:00:00 2001
From: Jakob Rydhof <jry@famly.co>
Date: Fri, 15 Jul 2022 10:17:19 +0200
Subject: [PATCH 2/2] yq-go: define yq alternative
---
srcpkgs/yq-go/template | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 09438dd18879..e0035cc787b8 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
# Template file for 'yq-go'
pkgname=yq-go
version=4.25.3
-revision=1
+revision=2
wrksrc="yq-${version}"
build_style=go
go_import_path=github.com/mikefarah/yq/v4
@@ -13,6 +13,9 @@ changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.t
distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
checksum=30309ae4efbe8b4f0a26e3c878bac72288faa0ba54f544c7fecdb3e0373966eb
+
+alternatives="yq:yq:/usr/bin/yq-go"
+
do_check() {
go test -v
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] Yq alternatives
2022-07-15 8:21 [PR PATCH] Yq alternatives MarleDK
@ 2022-07-15 8:24 ` MarleDK
2022-07-15 15:05 ` Chocimier
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: MarleDK @ 2022-07-15 8:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
There is an updated pull request by MarleDK against master on the void-packages repository
https://github.com/MarleDK/void-packages yq-alternatives
https://github.com/void-linux/void-packages/pull/38081
Yq alternatives
#### Testing the changes
- I tested the changes in this PR: **briefly**
- I tested by installing both `yq` and `yq-go`, and changed the alternative, to see if it changed what `yq` would run
A patch file from https://github.com/void-linux/void-packages/pull/38081.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-yq-alternatives-38081.patch --]
[-- Type: text/x-diff, Size: 1816 bytes --]
From b2b344e8159e14458fe93de0abc8de2bf3ac725b Mon Sep 17 00:00:00 2001
From: Jakob Rydhof <jry@famly.co>
Date: Fri, 15 Jul 2022 10:17:07 +0200
Subject: [PATCH 1/2] yq: define yq alternative
---
srcpkgs/yq/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/yq/template b/srcpkgs/yq/template
index b775674672ac..a1d482d21fc3 100644
--- a/srcpkgs/yq/template
+++ b/srcpkgs/yq/template
@@ -1,7 +1,7 @@
# Template file for 'yq'
pkgname=yq
version=3.0.1
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="python3-setuptools_scm"
makedepends="python3-yaml"
@@ -14,6 +14,8 @@ homepage="https://github.com/kislyuk/yq"
distfiles="${PYPI_SITE}/y/yq/yq-${version}.tar.gz"
checksum=a5e61078facd7ee4222f4346b5b50c4e9cea5e9d3330f074b5ea2c203bf639b1
+alternatives="yq:yq:/usr/bin/yq"
+
do_check() {
python3 test/test.py
}
From 74d5b864b8bd63e880923b5c7a4859783fa2bca1 Mon Sep 17 00:00:00 2001
From: Jakob Rydhof <jry@famly.co>
Date: Fri, 15 Jul 2022 10:17:19 +0200
Subject: [PATCH 2/2] yq-go: define yq alternative
---
srcpkgs/yq-go/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/yq-go/template b/srcpkgs/yq-go/template
index 09438dd18879..3fa3d4a0809d 100644
--- a/srcpkgs/yq-go/template
+++ b/srcpkgs/yq-go/template
@@ -1,7 +1,7 @@
# Template file for 'yq-go'
pkgname=yq-go
version=4.25.3
-revision=1
+revision=2
wrksrc="yq-${version}"
build_style=go
go_import_path=github.com/mikefarah/yq/v4
@@ -13,6 +13,8 @@ changelog="https://raw.githubusercontent.com/mikefarah/yq/master/release_notes.t
distfiles="https://github.com/mikefarah/yq/archive/v${version}.tar.gz"
checksum=30309ae4efbe8b4f0a26e3c878bac72288faa0ba54f544c7fecdb3e0373966eb
+alternatives="yq:yq:/usr/bin/yq-go"
+
do_check() {
go test -v
}
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Yq alternatives
2022-07-15 8:21 [PR PATCH] Yq alternatives MarleDK
2022-07-15 8:24 ` [PR PATCH] [Updated] " MarleDK
@ 2022-07-15 15:05 ` Chocimier
2022-07-15 15:05 ` [PR PATCH] [Closed]: " Chocimier
2022-07-15 15:24 ` MarleDK
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2022-07-15 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/38081#issuecomment-1185635210
Comment:
This tools are not compatible, so should not be marked as alternatives.
$ yq-go '.on.pull_request' < void-packages/.github/workflows/build.yaml
paths:
- 'srcpkgs/**'
$ yq '.on.pull_request' < void-packages/.github/workflows/build.yaml
{
"paths": [
"srcpkgs/**"
]
}
Also entry on yq is broken, if it worked it was pure luck. See how it behave when changing back from yq-go to yq.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: Yq alternatives
2022-07-15 8:21 [PR PATCH] Yq alternatives MarleDK
2022-07-15 8:24 ` [PR PATCH] [Updated] " MarleDK
2022-07-15 15:05 ` Chocimier
@ 2022-07-15 15:05 ` Chocimier
2022-07-15 15:24 ` MarleDK
3 siblings, 0 replies; 5+ messages in thread
From: Chocimier @ 2022-07-15 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 344 bytes --]
There's a closed pull request on the void-packages repository
Yq alternatives
https://github.com/void-linux/void-packages/pull/38081
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
- I tested by installing both `yq` and `yq-go`, and changed the alternative, to see if it changed what `yq` would run
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: Yq alternatives
2022-07-15 8:21 [PR PATCH] Yq alternatives MarleDK
` (2 preceding siblings ...)
2022-07-15 15:05 ` [PR PATCH] [Closed]: " Chocimier
@ 2022-07-15 15:24 ` MarleDK
3 siblings, 0 replies; 5+ messages in thread
From: MarleDK @ 2022-07-15 15:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 581 bytes --]
New comment by MarleDK on void-packages repository
https://github.com/void-linux/void-packages/pull/38081#issuecomment-1185651530
Comment:
Okay, didn't know the alternatives had to be compatible. Sorry for not reading more up on this before making the PR.
Just ran into a problem because alpine had yq-go, as their yq package, and needed a script to be able to run on both my PC, and one based on alpine.
So thought this would be a cleaner way of implementing it, than manually making a symbolic link.
And thought others might have the same desire to use yq-go as their yq.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-15 15:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-15 8:21 [PR PATCH] Yq alternatives MarleDK
2022-07-15 8:24 ` [PR PATCH] [Updated] " MarleDK
2022-07-15 15:05 ` Chocimier
2022-07-15 15:05 ` [PR PATCH] [Closed]: " Chocimier
2022-07-15 15:24 ` MarleDK
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).