From 5f5138b3b8adb7c1604d26624ae4684f722c6333 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 16 Dec 2022 05:00:52 -0500 Subject: [PATCH 1/4] .github/workflows: use checkout script instead of action also fix indentation in cycle check --- .github/workflows/build.yaml | 42 ++++++++++++++++++++++------ .github/workflows/cycles.yml | 53 +++++++++++++++++++++++------------- 2 files changed, 68 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 95f1cd88e338..ddb2c4e78f2e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -26,10 +26,23 @@ jobs: LICENSE_LIST: common/travis/license.lst steps: - - uses: actions/checkout@v1 - with: - fetch-depth: 200 - - run: common/travis/fetch_upstream.sh + - name: Clone and checkout + run: | + REMOTE_REF=$(echo ${{ github.ref }} | sed 's;refs/;refs/remotes/;') + /bin/echo -e '::group::\x1b[32mCloning repository...\x1b[0m' + git clone --progress --no-checkout --filter=tree:0 \ + "${{ github.server_url }}/${{ github.repository }}" "$PWD" + git config --global --add gc.auto 0 + git config --global --add safe.directory "$PWD" + echo "::endgroup::" + /bin/echo -e '::group::\x1b[32mFetching repository refs...\x1b[0m' + git fetch --prune --progress --filter=tree:0 origin \ + +refs/heads/*:refs/remotes/origin/* \ + +${{ github.ref }}:"${REMOTE_REF}" + echo "::endgroup::" + /bin/echo -e '::group::\x1b[32mChecking out repository...\x1b[0m' + git checkout --progress --force "${REMOTE_REF}" + echo "::endgroup::" - run: common/travis/changed_templates.sh - run: common/travis/fetch-xbps.sh - run: common/travis/fetch-xtools.sh @@ -73,15 +86,28 @@ jobs: # Upgrade again (in case there was a xbps update) xbps-install -yu - - uses: actions/checkout@v1 - with: - fetch-depth: 200 + - name: Clone and checkout + run: | + REMOTE_REF=$(echo ${{ github.ref }} | sed 's;refs/;refs/remotes/;') + /bin/echo -e '::group::\x1b[32mCloning repository...\x1b[0m' + git clone --progress --no-checkout --filter=tree:0 \ + "${{ github.server_url }}/${{ github.repository }}" "$PWD" + git config --global --add gc.auto 0 + git config --global --add safe.directory "$PWD" + echo "::endgroup::" + /bin/echo -e '::group::\x1b[32mFetching repository refs...\x1b[0m' + git fetch --prune --progress --filter=tree:0 origin \ + +refs/heads/*:refs/remotes/origin/* \ + +${{ github.ref }}:"${REMOTE_REF}" + echo "::endgroup::" + /bin/echo -e '::group::\x1b[32mChecking out repository...\x1b[0m' + git checkout --progress --force "${REMOTE_REF}" + echo "::endgroup::" - name: Create hostrepo and prepare masterdir run: | ln -s "$(pwd)" /hostrepo && common/travis/set_mirror.sh && common/travis/prepare.sh && - common/travis/fetch_upstream.sh && common/travis/fetch-xtools.sh - run: common/travis/changed_templates.sh diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml index 7d781076dbe9..f0631abc899d 100644 --- a/.github/workflows/cycles.yml +++ b/.github/workflows/cycles.yml @@ -10,7 +10,9 @@ jobs: permissions: issues: write container: - image: 'ghcr.io/void-linux/xbps-src-masterdir:20220527RC01-x86_64-musl' + image: 'ghcr.io/void-linux/xbps-src-masterdir:20220527RC01-x86_64-musl' + env: + PATH: '/usr/libexec/chroot-git:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/sbin:/usr/local/bin:/tmp/bin' steps: - name: Prepare container run: | @@ -23,26 +25,39 @@ jobs: xbps-install -yu # Install script dependencies xbps-install -y python3-networkx github-cli - - uses: actions/checkout@v1 - with: - fetch-depth: 1 + + - name: Clone and checkout + run: | + REMOTE_REF=$(echo ${{ github.ref }} | sed 's;refs/;refs/remotes/;') + /bin/echo -e '::group::\x1b[32mCloning repository...\x1b[0m' + git clone --progress --no-checkout --filter=tree:0 \ + "${{ github.server_url }}/${{ github.repository }}" "$PWD" + git config --global --add gc.auto 0 + git config --global --add safe.directory "$PWD" + echo "::endgroup::" + /bin/echo -e '::group::\x1b[32mFetching repository refs...\x1b[0m' + git fetch --prune --progress --filter=tree:0 origin \ + +refs/heads/*:refs/remotes/origin/* \ + +${{ github.ref }}:"${REMOTE_REF}" + echo "::endgroup::" + /bin/echo -e '::group::\x1b[32mChecking out repository...\x1b[0m' + git checkout --progress --force "${REMOTE_REF}" + echo "::endgroup::" + - name: Create hostrepo and prepare masterdir run: | - ln -s "$(pwd)" /hostrepo && - common/travis/set_mirror.sh && - common/travis/prepare.sh + ln -s "$(pwd)" /hostrepo && + common/travis/set_mirror.sh && + common/travis/prepare.sh - name: Find cycles and open issues run: | - PATH="/usr/libexec/chroot-git:$PATH" - # required by git 2.35.2+ - git 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 - printf "Issue on '%s' already exists.\n" "$line" - else - gh issue create -R "$GITHUB_REPOSITORY" -b '' -t "$line" - fi - done + 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 + printf "Issue on '%s' already exists.\n" "$line" + else + gh issue create -R "$GITHUB_REPOSITORY" -b '' -t "$line" + fi + done env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN }} From bf4750b284e1547e5ec570fe8f4899a9efa10fa0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 16 Dec 2022 04:59:55 -0500 Subject: [PATCH 2/4] common/travis/fetch_upstream.sh: remove now-unnecessary script --- common/travis/fetch_upstream.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100755 common/travis/fetch_upstream.sh diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh deleted file mode 100755 index e5ec5979493b..000000000000 --- a/common/travis/fetch_upstream.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# changed_templates.sh - -# required by git 2.35.2+ -git config --global --add safe.directory "$PWD" - -/bin/echo -e '\x1b[32mFetching upstream...\x1b[0m' -git fetch --depth 200 https://github.com/void-linux/void-packages.git master From 2a7335b95aaa445effc10a3c56e2b2c5cbac4a02 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 16 Dec 2022 06:36:15 -0500 Subject: [PATCH 3/4] common/travis/changed_templates.sh: change branch age check for treeless --- common/travis/changed_templates.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index 2bed2250ae71..e6a4328e3c49 100755 --- a/common/travis/changed_templates.sh +++ b/common/travis/changed_templates.sh @@ -10,9 +10,10 @@ case "$tip" in *) tip="${tip%% *}" ;; esac -base="$(git merge-base FETCH_HEAD "$tip")" || { - echo "Your branches is based on too old copy." - echo "Please rebase to newest copy." +base="$(git merge-base FETCH_HEAD "$tip")" + +[ $(git rev-list --count "$tip" "^$base") -lt 200 ] || { + echo "::error title=Branch out of date::Your branch is too out of date. Please rebase on upstream and force-push." exit 1 } From 01ad15d00d61a9258ef9161cdd3fe3a3c644cb4a Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Fri, 16 Dec 2022 05:01:46 -0500 Subject: [PATCH 4/4] chezmoi: TEST COMMIT PLS IGNORE --- srcpkgs/chezmoi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/chezmoi/template b/srcpkgs/chezmoi/template index a2d74b841d70..a74539bb1615 100644 --- a/srcpkgs/chezmoi/template +++ b/srcpkgs/chezmoi/template @@ -1,7 +1,7 @@ # Template file for 'chezmoi' pkgname=chezmoi version=2.27.3 -revision=1 +revision=2 build_style=go go_import_path="github.com/twpayne/chezmoi/v2" go_build_tags="noembeddocs noupgrade"