From 586c2a64a3d1e8cf7d58be1637895c4ec588e765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 10 Jan 2023 22:00:00 +0100 Subject: [PATCH 1/3] .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." From a0b66fa50051c1e24f7a399cb2c8b965ba7f6be9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 10 Jan 2023 22:00:26 +0100 Subject: [PATCH 2/3] common/travis/changed_templates.sh: explain --- common/travis/changed_templates.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh index 91af1f1a3c1a..ac618347051d 100755 --- a/common/travis/changed_templates.sh +++ b/common/travis/changed_templates.sh @@ -12,6 +12,8 @@ esac base="$(git merge-base origin/HEAD "$tip")" +echo origin/HEAD=$(git rev-list -1 --parents origin/HEAD) base=$base tip=$tip HEAD=$(git rev-parse HEAD) FETCH_HEAD=$(git rev-parse FETCH_HEAD) +git branch -av [ $(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 92b5cf905f0e170a9d5395c3750057b181a17a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= Date: Tue, 10 Jan 2023 22:05:11 +0100 Subject: [PATCH 3/3] trigger workflow --- srcpkgs/base-system/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template index cf3982622059..61d00ce16e04 100644 --- a/srcpkgs/base-system/template +++ b/srcpkgs/base-system/template @@ -1,4 +1,4 @@ -# Template file for 'base-system' +# Template file for 'base-system'. pkgname=base-system version=0.114 revision=1