From 8fe8739a2317b4a3702c1686721898cc5778569e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 9 Oct 2022 01:51:18 -0400 Subject: [PATCH] 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 f372deb820a..6aea99d5115 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 facba3957c4..f900d90224d 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 534cd97a12b..2bed2250ae7 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 40c136f3857..e5ec5979493 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"