From: Chocimier <Chocimier@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] .github/workflows: compare PR branch to master
Date: Tue, 10 Jan 2023 22:17:24 +0100 [thread overview]
Message-ID: <20230110211724.H6PG525VEsU-q-YjwkeRm1Vten2ht7Vs3kZHqdFwKbA@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-41567@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 646 bytes --]
There is an updated pull request by Chocimier against master on the void-packages repository
https://github.com/Chocimier/void-packages-org issue-41376
https://github.com/void-linux/void-packages/pull/41567
.github/workflows: compare PR branch to master
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: https://github.com/Chocimier/void-packages-org/actions/runs/3887255868/jobs/6633308137#step:3:1
@steinex: that resolves #41376 if applied to PR branch
A patch file from https://github.com/void-linux/void-packages/pull/41567.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-issue-41376-41567.patch --]
[-- Type: text/x-diff, Size: 956 bytes --]
From 586c2a64a3d1e8cf7d58be1637895c4ec588e765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Tue, 10 Jan 2023 22:00:00 +0100
Subject: [PATCH] .github/workflows: compare PR branch to master
Since 4410de52c1 we fetch all origin branches, and FETCH_HEAD can point
elsewhere
---
common/travis/changed_templates.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh
index e6a4328e3c49..91af1f1a3c1a 100755
--- a/common/travis/changed_templates.sh
+++ b/common/travis/changed_templates.sh
@@ -10,7 +10,7 @@ case "$tip" in
*) tip="${tip%% *}" ;;
esac
-base="$(git merge-base FETCH_HEAD "$tip")"
+base="$(git merge-base origin/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."
next prev parent reply other threads:[~2023-01-10 21:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 21:13 [PR PATCH] " Chocimier
2023-01-10 21:17 ` Chocimier [this message]
2023-01-10 23:07 ` [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=20230110211724.H6PG525VEsU-q-YjwkeRm1Vten2ht7Vs3kZHqdFwKbA@z \
--to=chocimier@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).