From cf75a46f330b7bb44a86537962052c2bf4f6ade4 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 16 Sep 2022 00:14:21 -0400 Subject: [PATCH 1/4] .github/workflows/build.yaml: update actions/checkout --- .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..a41a647da757 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,7 +26,7 @@ jobs: LICENSE_LIST: common/travis/license.lst steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 with: fetch-depth: 200 - run: common/travis/fetch_upstream.sh @@ -73,7 +73,7 @@ jobs: # Upgrade again (in case there was a xbps update) xbps-install -yu - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 with: fetch-depth: 200 - name: Create hostrepo and prepare masterdir From 4fac459c7153f7196dbfddcac6f95bbfe4ae0614 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 16 Sep 2022 00:14:45 -0400 Subject: [PATCH 2/4] .github/workflows/cycles.yml: update actions/checkout manually setting safe.directory is no longer necessary --- .github/workflows/cycles.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml index 3f85ac6fa74a..d7ab9e0d3390 100644 --- a/.github/workflows/cycles.yml +++ b/.github/workflows/cycles.yml @@ -23,7 +23,7 @@ jobs: xbps-install -yu # Install script dependencies xbps-install -y python3-networkx github-cli - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 with: fetch-depth: 1 - name: Create hostrepo and prepare masterdir @@ -38,8 +38,6 @@ jobs: elif command -v git >/dev/null 2>&1; then GIT_CMD=$(command -v git) fi - # required by git 2.35.2+ - $GIT_CMD config --global --add safe.directory "$PWD" common/scripts/xbps-cycles.py | tee cycles grep 'Cycle:' cycles | while read -r line; do if gh issue list -R "$GITHUB_REPOSITORY" -S "$line" | grep .; then From e6840d8050bd93d93824ec66d20847372a3bd8b0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 16 Sep 2022 00:15:51 -0400 Subject: [PATCH 3/4] common/travis/fetch_upstream.sh: remove unnecessary git config no longer needed with actions/checkout@v3 --- common/travis/fetch_upstream.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh index 049cfd69e54d..45315563e0b1 100755 --- a/common/travis/fetch_upstream.sh +++ b/common/travis/fetch_upstream.sh @@ -8,8 +8,5 @@ elif command -v git >/dev/null 2>&1; then GIT_CMD=$(command -v git) fi -# required by git 2.35.2+ -$GIT_CMD config --global --add safe.directory "$PWD" - /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m' $GIT_CMD fetch --depth 200 https://github.com/void-linux/void-packages.git master From f44808c9d6425558859d2c5d3d98b498c8977dea Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 16 Sep 2022 00:21:07 -0400 Subject: [PATCH 4/4] TMP chezmoi: test --- srcpkgs/chezmoi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index 13505278dbaa..b333e8945f7e 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,7 +1,7 @@ # Template file for 'chezmoi' pkgname=chezmoi version=2.22.1 -revision=1 +revision=2 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" go_build_tags="noembeddocs noupgrade"