From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] CI: unify path handling
Date: Sun, 09 Oct 2022 07:57:23 +0200 [thread overview]
Message-ID: <20221009055723.e_aTLaHNbyqYegXyE5fbNvhv4YdlA_8nkJ45PJuG6qM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39829@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 689 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages ci/path
https://github.com/void-linux/void-packages/pull/39829
CI: unify path handling
This `PATH` change was introduced in #39309, and parts of it felt kind of hacked on. This streamlines it
- .github/workflows/build.yaml: add /usr/libexec/chroot-git to PATH
- common/: remove PATH adds from CI scripts
#### Testing the changes
- I tested the changes in this PR: **YES** - https://github.com/void-linux/void-packages/actions/runs/3213065830
A patch file from https://github.com/void-linux/void-packages/pull/39829.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ci/path-39829.patch --]
[-- Type: text/x-diff, Size: 3341 bytes --]
From 63b0a751ede36912b35aafe181b7772bfcf03f36 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Oct 2022 01:49:22 -0400
Subject: [PATCH 1/2] .github/workflows/build.yaml: add /usr/libexec/chroot-git
to PATH
---
.github/workflows/build.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index ce995e2d9c79..95f1cd88e338 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
env:
- PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+ PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
XLINT: '1'
LICENSE_LIST: common/travis/license.lst
@@ -44,7 +44,7 @@ jobs:
container:
image: 'ghcr.io/void-linux/xbps-src-masterdir:20220527RC01-${{ matrix.config.bootstrap }}'
env:
- PATH: '/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
+ PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin'
ARCH: '${{ matrix.config.arch }}'
BOOTSTRAP: '${{ matrix.config.bootstrap }}'
TEST: '${{ matrix.config.test }}'
From ef4ef5afa22f1fae79bed152713ca04e45d0a62a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 9 Oct 2022 01:51:18 -0400
Subject: [PATCH 2/2] common/: remove PATH adds from CI scripts
they are now specified in the workflow file
---
common/scripts/lint-commits | 1 -
common/scripts/lint-version-change | 1 -
common/travis/changed_templates.sh | 2 --
common/travis/fetch_upstream.sh | 2 --
4 files changed, 6 deletions(-)
diff --git a/common/scripts/lint-commits b/common/scripts/lint-commits
index f372deb820af..6aea99d51154 100755
--- a/common/scripts/lint-commits
+++ b/common/scripts/lint-commits
@@ -5,7 +5,6 @@ die() {
exit 1
}
-PATH="/usr/libexec/chroot-git:$PATH"
command -v git >/dev/null 2>&1 ||
die "neither chroot-git nor git could be found!"
diff --git a/common/scripts/lint-version-change b/common/scripts/lint-version-change
index facba3957c4a..f900d90224d3 100755
--- a/common/scripts/lint-version-change
+++ b/common/scripts/lint-version-change
@@ -13,7 +13,6 @@ if ! [ "$base_rev" ]; then
die "usage: $0 TEMPLATE BASE-REVISION [TIP-REVISION]"
fi
-PATH="/usr/libexec/chroot-git:$PATH"
if ! command -v git >/dev/null 2>&1; then
die "neither chroot-git nor git could be found"
fi
diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh
index 534cd97a12b1..2bed2250ae71 100755
--- a/common/travis/changed_templates.sh
+++ b/common/travis/changed_templates.sh
@@ -2,8 +2,6 @@
#
# changed_templates.sh
-PATH="/usr/libexec/chroot-git:$PATH"
-
tip="$(git rev-list -1 --parents HEAD)"
case "$tip" in
# This is a merge commit, pick last parent
diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index 40c136f3857c..e5ec5979493b 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -2,8 +2,6 @@
#
# changed_templates.sh
-PATH="/usr/libexec/chroot-git:$PATH"
-
# required by git 2.35.2+
git config --global --add safe.directory "$PWD"
next prev parent reply other threads:[~2022-10-09 5:57 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-09 5:52 [PR PATCH] " classabbyamp
2022-10-09 5:53 ` [PR PATCH] [Updated] " classabbyamp
2022-10-09 5:57 ` classabbyamp [this message]
2022-10-25 18:23 ` [PR PATCH] [Merged]: " classabbyamp
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=20221009055723.e_aTLaHNbyqYegXyE5fbNvhv4YdlA_8nkJ45PJuG6qM@z \
--to=classabbyamp@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).