Github messages for voidlinux
 help / color / mirror / Atom feed
From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] ci: use treeless clone instead of actions/checkout
Date: Fri, 16 Dec 2022 12:38:52 +0100	[thread overview]
Message-ID: <20221216113852.fP1sBezmh7Q6HJQ1e0pun51OVPd1G68t_whIiWUfdNg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41130@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages ci/treeless-clone
https://github.com/void-linux/void-packages/pull/41130

ci: use treeless clone instead of actions/checkout
WIP for now, still testing

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**



A patch file from https://github.com/void-linux/void-packages/pull/41130.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ci/treeless-clone-41130.patch --]
[-- Type: text/x-diff, Size: 8229 bytes --]

From a8f4d64774bde88410ce8aef454db9a6f3fb37e9 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 04:59:55 -0500
Subject: [PATCH 1/4] common/travis/fetch_upstream: clean up

---
 common/travis/fetch_upstream.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/common/travis/fetch_upstream.sh b/common/travis/fetch_upstream.sh
index e5ec5979493b..0813e0acedbc 100755
--- a/common/travis/fetch_upstream.sh
+++ b/common/travis/fetch_upstream.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #
-# changed_templates.sh
-
-# required by git 2.35.2+
-git config --global --add safe.directory "$PWD"
+# fetch_upstream.sh
 
 /bin/echo -e '\x1b[32mFetching upstream...\x1b[0m'
 git fetch --depth 200 https://github.com/void-linux/void-packages.git master

From 4b40862d704b3910341f21521585fa588742591c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:00:52 -0500
Subject: [PATCH 2/4] .github/workflows: use checkout script instead of action

also fix indentation in cycle check
---
 .github/workflows/build.yaml | 34 +++++++++++++++++++-----
 .github/workflows/cycles.yml | 50 ++++++++++++++++++++++--------------
 2 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 95f1cd88e338..5eb3da82d037 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,9 +26,20 @@ jobs:
       LICENSE_LIST: common/travis/license.lst
 
     steps:
-      - 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 '\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"
+          /bin/echo -e '\x1b[32mFetching repository refs...\x1b[0m'
+          git fetch --prune --progress --filter=tree:0 origin \
+              +refs/heads/*:refs/remotes/origin/* \
+              +${{ github.ref }}:"${REMOTE_REF}"
+          /bin/echo -e '\x1b[32mChecking out repository...\x1b[0m'
+          git checkout --progress --force "${REMOTE_REF}"
       - run: common/travis/fetch_upstream.sh
       - run: common/travis/changed_templates.sh
       - run: common/travis/fetch-xbps.sh
@@ -73,9 +84,20 @@ 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 '\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"
+          /bin/echo -e '\x1b[32mFetching repository refs...\x1b[0m'
+          git fetch --prune --progress --filter=tree:0 origin \
+              +refs/heads/*:refs/remotes/origin/* \
+              +${{ github.ref }}:"${REMOTE_REF}"
+          /bin/echo -e '\x1b[32mChecking out repository...\x1b[0m'
+          git checkout --progress --force "${REMOTE_REF}"
       - name: Create hostrepo and prepare masterdir
         run: |
          ln -s "$(pwd)" /hostrepo &&
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 7d781076dbe9..693321210916 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,36 @@ 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 '\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"
+          /bin/echo -e '\x1b[32mFetching repository refs...\x1b[0m'
+          git fetch --prune --progress --filter=tree:0 origin \
+              +refs/heads/*:refs/remotes/origin/* \
+              +${{ github.ref }}:"${REMOTE_REF}"
+          /bin/echo -e '\x1b[32mChecking out repository...\x1b[0m'
+          git checkout --progress --force "${REMOTE_REF}"
+
       - 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 51f352288e2bad8467481adde7fddf59e0717734 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:01:46 -0500
Subject: [PATCH 3/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"

From 0c7d5c99d06ff3548afbe788cb3e4613379afffb Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 06:36:15 -0500
Subject: [PATCH 4/4] common/travis/changed_templates.sh: change branch age
 check for treeless

---
 common/travis/changed_templates.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh
index 2bed2250ae71..d7a3e1dd407b 100755
--- a/common/travis/changed_templates.sh
+++ b/common/travis/changed_templates.sh
@@ -10,7 +10,10 @@ case "$tip" in
 	*)         tip="${tip%% *}" ;;
 esac
 
-base="$(git merge-base FETCH_HEAD "$tip")" || {
+base="$(git merge-base FETCH_HEAD "$tip")"
+echo base: $base
+
+[ $(git rev-list --count "$tip" "^$base") -lt 200 ] || {
 	echo "Your branches is based on too old copy."
 	echo "Please rebase to newest copy."
 	exit 1

  parent reply	other threads:[~2022-12-16 11:38 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-16 10:02 [PR PATCH] " classabbyamp
2022-12-16 10:08 ` [PR PATCH] [Updated] " classabbyamp
2022-12-16 10:14 ` classabbyamp
2022-12-16 10:21 ` classabbyamp
2022-12-16 10:32 ` classabbyamp
2022-12-16 10:36 ` classabbyamp
2022-12-16 10:46 ` classabbyamp
2022-12-16 10:59 ` classabbyamp
2022-12-16 11:02 ` classabbyamp
2022-12-16 11:36 ` classabbyamp
2022-12-16 11:38 ` classabbyamp [this message]
2022-12-16 11:42 ` classabbyamp
2022-12-16 11:58 ` classabbyamp
2022-12-16 12:05 ` classabbyamp
2022-12-16 12:25 ` classabbyamp
2022-12-21  6:15 ` [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=20221216113852.fP1sBezmh7Q6HJQ1e0pun51OVPd1G68t_whIiWUfdNg@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).