Skip to content

Commit 44cfe7d

Browse files
phadejphadej
authored
Merge pull request #6946 from phadej/issue-6945-fix-ci-checkout
Fix #6945 Fetch by GITHUB_SHA
2 parents 2d78853 + 22649ce commit 44cfe7d

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

‎.github/workflows/linux.yml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ jobs:
4646
# - uses: actions/checkout@v2
4747
- name: Checkout
4848
run: |
49+
echo $GITHUB_REF $GITHUB_SHA
4950
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
50-
git fetch origin $GITHUB_REF:temporary-ci-branch
51+
git fetch origin $GITHUB_SHA:temporary-ci-branch
5152
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
5253
- name: Validate print-config
5354
run: sh validate.sh -j 2 -w ghc-8.10.1 -v -s print-config
@@ -92,8 +93,9 @@ jobs:
9293
# - uses: actions/checkout@v2
9394
- name: Checkout
9495
run: |
96+
echo $GITHUB_REF $GITHUB_SHA
9597
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
96-
git fetch origin $GITHUB_REF:temporary-ci-branch
98+
git fetch origin $GITHUB_SHA:temporary-ci-branch
9799
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
98100
- name: Validate print-config
99101
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --solver-benchmarks -s print-config
@@ -139,8 +141,9 @@ jobs:
139141
# - uses: actions/checkout@v2
140142
- name: Checkout
141143
run: |
144+
echo $GITHUB_REF $GITHUB_SHA
142145
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
143-
git fetch origin $GITHUB_REF:temporary-ci-branch
146+
git fetch origin $GITHUB_SHA:temporary-ci-branch
144147
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
145148
- name: Validate print-config
146149
run: sh validate.sh -j 2 -w ghc-8.6.5 -v --complete-hackage-tests -s print-config
@@ -186,8 +189,9 @@ jobs:
186189
# - uses: actions/checkout@v2
187190
- name: Checkout
188191
run: |
192+
echo $GITHUB_REF $GITHUB_SHA
189193
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
190-
git fetch origin $GITHUB_REF:temporary-ci-branch
194+
git fetch origin $GITHUB_SHA:temporary-ci-branch
191195
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
192196
- name: Validate print-config
193197
run: sh validate.sh -j 2 -w ghc-8.4.4 -v -s print-config
@@ -233,8 +237,9 @@ jobs:
233237
# - uses: actions/checkout@v2
234238
- name: Checkout
235239
run: |
240+
echo $GITHUB_REF $GITHUB_SHA
236241
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
237-
git fetch origin $GITHUB_REF:temporary-ci-branch
242+
git fetch origin $GITHUB_SHA:temporary-ci-branch
238243
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
239244
- name: Validate print-config
240245
run: sh validate.sh -j 2 -w ghc-8.2.2 -v -s print-config
@@ -280,8 +285,9 @@ jobs:
280285
# - uses: actions/checkout@v2
281286
- name: Checkout
282287
run: |
288+
echo $GITHUB_REF $GITHUB_SHA
283289
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
284-
git fetch origin $GITHUB_REF:temporary-ci-branch
290+
git fetch origin $GITHUB_SHA:temporary-ci-branch
285291
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
286292
- name: Validate print-config
287293
run: sh validate.sh -j 2 -w ghc-8.0.2 -v -s print-config
@@ -327,8 +333,9 @@ jobs:
327333
# - uses: actions/checkout@v2
328334
- name: Checkout
329335
run: |
336+
echo $GITHUB_REF $GITHUB_SHA
330337
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
331-
git fetch origin $GITHUB_REF:temporary-ci-branch
338+
git fetch origin $GITHUB_SHA:temporary-ci-branch
332339
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
333340
- name: Validate print-config
334341
run: sh validate.sh -j 2 -w ghc-7.10.3 -v -s print-config
@@ -374,8 +381,9 @@ jobs:
374381
# - uses: actions/checkout@v2
375382
- name: Checkout
376383
run: |
384+
echo $GITHUB_REF $GITHUB_SHA
377385
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
378-
git fetch origin $GITHUB_REF:temporary-ci-branch
386+
git fetch origin $GITHUB_SHA:temporary-ci-branch
379387
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
380388
- name: Validate print-config
381389
run: sh validate.sh -j 2 -w ghc-7.8.4 -v --lib-only -s print-config
@@ -419,8 +427,9 @@ jobs:
419427
# - uses: actions/checkout@v2
420428
- name: Checkout
421429
run: |
430+
echo $GITHUB_REF $GITHUB_SHA
422431
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
423-
git fetch origin $GITHUB_REF:temporary-ci-branch
432+
git fetch origin $GITHUB_SHA:temporary-ci-branch
424433
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
425434
- name: Validate print-config
426435
run: sh validate.sh -j 2 -w ghc-7.6.3 -v --lib-only -s print-config
@@ -466,8 +475,9 @@ jobs:
466475
# - uses: actions/checkout@v2
467476
- name: Checkout
468477
run: |
478+
echo $GITHUB_REF $GITHUB_SHA
469479
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
470-
git fetch origin $GITHUB_REF:temporary-ci-branch
480+
git fetch origin $GITHUB_SHA:temporary-ci-branch
471481
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
472482
- name: Validate print-config
473483
run: sh validate.sh -j 2 -w ghc-8.8.3 -v --lib-only -s print-config

‎boot/ci-linux.template.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ jobs:
6161
# - uses: actions/checkout@v2
6262
- name: Checkout
6363
run: |
64+
echo $GITHUB_REF $GITHUB_SHA
6465
git clone --depth 1 https://github.com/$GITHUB_REPOSITORY.git .
65-
git fetch origin $GITHUB_REF:temporary-ci-branch
66+
git fetch origin $GITHUB_SHA:temporary-ci-branch
6667
git checkout $GITHUB_SHA || (git fetch && git checkout $GITHUB_SHA)
6768
{% for step in job.steps %}
6869
- name: Validate {{step}}

0 commit comments

Comments
 (0)