@@ -12,49 +12,49 @@ jobs:
1212 up_to_date :
1313 runs-on : ubuntu-24.04
1414 steps :
15- - uses : actions/checkout@v4
16- with :
17- fetch-depth : 0
18- - name : Check for missing commits
19- id : commits
20- env :
21- SUGGESTION : |
15+ - uses : actions/checkout@v4
16+ with :
17+ fetch-depth : 0
18+ - name : Check for missing commits
19+ id : commits
20+ env :
21+ SUGGESTION : |
2222
23- If you are reading this, then the commits indicated above are
24- missing from "develop" and/or "release". Do a reverse-merge
25- as soon as possible. See CONTRIBUTING.md for instructions.
26- run : |
27- set -o pipefail
28- # Branches ordered by how "canonical" they are. Every commit in
29- # one branch should be in all the branches behind it
30- order=( master release develop )
31- branches=()
32- for branch in "${order[@]}"
33- do
34- # Check that the branches exist so that this job will work on
35- # forked repos, which don't necessarily have master and
36- # release branches.
37- if git ls-remote --exit-code --heads origin \
38- refs/heads/${branch} > /dev/null
39- then
40- branches+=( origin/${branch} )
41- fi
42- done
23+ If you are reading this, then the commits indicated above are
24+ missing from "develop" and/or "release". Do a reverse-merge
25+ as soon as possible. See CONTRIBUTING.md for instructions.
26+ run : |
27+ set -o pipefail
28+ # Branches ordered by how "canonical" they are. Every commit in
29+ # one branch should be in all the branches behind it
30+ order=( master release develop )
31+ branches=()
32+ for branch in "${order[@]}"
33+ do
34+ # Check that the branches exist so that this job will work on
35+ # forked repos, which don't necessarily have master and
36+ # release branches.
37+ if git ls-remote --exit-code --heads origin \
38+ refs/heads/${branch} > /dev/null
39+ then
40+ branches+=( origin/${branch} )
41+ fi
42+ done
4343
44- prior=()
45- for branch in "${branches[@]}"
46- do
47- if [[ ${#prior[@]} -ne 0 ]]
44+ prior=()
45+ for branch in "${branches[@]}"
46+ do
47+ if [[ ${#prior[@]} -ne 0 ]]
48+ then
49+ echo "Checking ${prior[@]} for commits missing from ${branch}"
50+ git log --oneline --no-merges "${prior[@]}" \
51+ ^$branch | tee -a "missing-commits.txt"
52+ echo
53+ fi
54+ prior+=( "${branch}" )
55+ done
56+ if [[ $( cat missing-commits.txt | wc -l ) -ne 0 ]]
4857 then
49- echo "Checking ${prior[@]} for commits missing from ${branch}"
50- git log --oneline --no-merges "${prior[@]}" \
51- ^$branch | tee -a "missing-commits.txt"
52- echo
58+ echo "${SUGGESTION}"
59+ exit 1
5360 fi
54- prior+=( "${branch}" )
55- done
56- if [[ $( cat missing-commits.txt | wc -l ) -ne 0 ]]
57- then
58- echo "${SUGGESTION}"
59- exit 1
60- fi
0 commit comments