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 11:32:42 +0100 [thread overview]
Message-ID: <20221216103242.8U1NrLRTISfn7iq7MimeFXMJZid6BLdTFs5h33xUF-o@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: 11190 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/5] 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 21b17e8a8435cdf7a700d993bbf2e0e6655dd2d4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:00:52 -0500
Subject: [PATCH 2/5] .github/workflows: use checkout script instead of action
also fix indentation in cycle check
---
.github/workflows/build.yaml | 24 ++++++++++++++-----
.github/workflows/cycles.yml | 45 +++++++++++++++++++++---------------
2 files changed, 44 insertions(+), 25 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 95f1cd88e338..12b7f0e1f0dd 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -26,9 +26,15 @@ jobs:
LICENSE_LIST: common/travis/license.lst
steps:
- - uses: actions/checkout@v1
- with:
- fetch-depth: 200
+ - name: Clone and checkout
+ run: |
+ /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
+ # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
+ git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+ git checkout ${{ github.ref_name }}
+
+ # required by git 2.35.2+
+ git config --global --add safe.directory "$PWD"
- run: common/travis/fetch_upstream.sh
- run: common/travis/changed_templates.sh
- run: common/travis/fetch-xbps.sh
@@ -73,9 +79,15 @@ 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: |
+ /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
+ # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
+ git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+ git checkout ${{ github.ref_name }}
+
+ # required by git 2.35.2+
+ git config --global --add safe.directory "$PWD"
- 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..e7ecb5075837 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,31 @@ 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: |
+ /bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
+ # https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
+ git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+ git checkout ${{ github.ref_name }}
+
+ # required by git 2.35.2+
+ git config --global --add safe.directory "$PWD"
+
- 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 8f305f7d51b82d1d8d1285f035a72c4fc5548d87 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:01:46 -0500
Subject: [PATCH 3/5] 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 8b7ad6f6d1aa49affe884c81541a8c54f9698f0b Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:20:55 -0500
Subject: [PATCH 4/5] fixup! .github/workflows: use checkout script instead of
action
---
.github/workflows/build.yaml | 6 ++++--
.github/workflows/cycles.yml | 3 ++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 12b7f0e1f0dd..aa52dd5292fc 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -31,7 +31,8 @@ jobs:
/bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
# https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
- git checkout ${{ github.ref_name }}
+ cd void-packages
+ git checkout ${{ github.ref }}
# required by git 2.35.2+
git config --global --add safe.directory "$PWD"
@@ -84,7 +85,8 @@ jobs:
/bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
# https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
- git checkout ${{ github.ref_name }}
+ cd void-packages
+ git checkout ${{ github.ref }}
# required by git 2.35.2+
git config --global --add safe.directory "$PWD"
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index e7ecb5075837..6631b2a2b3d5 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -31,7 +31,8 @@ jobs:
/bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
# https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
- git checkout ${{ github.ref_name }}
+ cd void-packages
+ git checkout ${{ github.ref }}
# required by git 2.35.2+
git config --global --add safe.directory "$PWD"
From ccc306d7de717c5265865cde386344d3afc910be Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Fri, 16 Dec 2022 05:32:33 -0500
Subject: [PATCH 5/5] fixup! fixup! .github/workflows: use checkout script
instead of action
---
.github/workflows/build.yaml | 10 ++++++++--
.github/workflows/cycles.yml | 5 ++++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index aa52dd5292fc..5408b6efc3ea 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,8 +30,11 @@ jobs:
run: |
/bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
# https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
- git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+ git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}
cd void-packages
+ git fetch --prune --progress --depth=200 origin \
+ +refs/heads/*:refs/remotes/origin/* \
+ +${{ github.ref }}:refs/remotes/pull/${{ github.ref_name }}
git checkout ${{ github.ref }}
# required by git 2.35.2+
@@ -84,8 +87,11 @@ jobs:
run: |
/bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
# https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
- git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+ git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}
cd void-packages
+ git fetch --prune --progress --depth=200 origin \
+ +refs/heads/*:refs/remotes/origin/* \
+ +${{ github.ref }}:refs/remotes/pull/${{ github.ref_name }}
git checkout ${{ github.ref }}
# required by git 2.35.2+
diff --git a/.github/workflows/cycles.yml b/.github/workflows/cycles.yml
index 6631b2a2b3d5..aee27509014e 100644
--- a/.github/workflows/cycles.yml
+++ b/.github/workflows/cycles.yml
@@ -30,8 +30,11 @@ jobs:
run: |
/bin/echo -e '\x1b[32mCloning repository...\x1b[0m'
# https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/
- git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}.git
+ git clone --filter=tree:0 ${{ github.server_url }}/${{ github.repository }}
cd void-packages
+ git fetch --prune --progress --depth=200 origin \
+ +refs/heads/*:refs/remotes/origin/* \
+ +${{ github.ref }}:refs/remotes/pull/${{ github.ref_name }}
git checkout ${{ github.ref }}
# required by git 2.35.2+
next prev parent reply other threads:[~2022-12-16 10:32 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 [this message]
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
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=20221216103242.8U1NrLRTISfn7iq7MimeFXMJZid6BLdTFs5h33xUF-o@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).