Skip to content

Commit e35b6dc

Browse files
committed
ci: fix manual checkout
1 parent 0b761bc commit e35b6dc

File tree

2 files changed

+30
-6
lines changed

2 files changed

+30
-6
lines changed

.github/workflows/clang.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,14 @@ jobs:
203203
- name: checkout
204204
run: |
205205
set -x
206+
echo GITHUB_REF=$GITHUB_REF
207+
echo GITHUB_HEAD_REF=$GITHUB_HEAD_REF
208+
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} # https://stackoverflow.com/questions/58033366
209+
echo branch=$branch
206210
git init -q .
207211
git config --system --add safe.directory '*' # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
208212
git remote add origin $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
209-
git fetch origin $GITHUB_HEAD_REF
213+
git fetch origin $branch
210214
git reset --hard FETCH_HEAD
211215
git submodule update --init --recursive
212216
- run: c4core-install ${{matrix.cxx}}

.github/workflows/gcc.yml

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,14 @@ jobs:
5454
- name: checkout
5555
run: |
5656
set -x
57+
echo GITHUB_REF=$GITHUB_REF
58+
echo GITHUB_HEAD_REF=$GITHUB_HEAD_REF
59+
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} # https://stackoverflow.com/questions/58033366
60+
echo branch=$branch
5761
git init -q .
5862
git config --system --add safe.directory '*' # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
5963
git remote add origin $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
60-
git fetch origin $GITHUB_HEAD_REF
64+
git fetch origin $branch
6165
git reset --hard FETCH_HEAD
6266
git submodule update --init --recursive
6367
- run: c4core-install ${{matrix.cxx}}
@@ -146,10 +150,14 @@ jobs:
146150
- name: checkout
147151
run: |
148152
set -x
153+
echo GITHUB_REF=$GITHUB_REF
154+
echo GITHUB_HEAD_REF=$GITHUB_HEAD_REF
155+
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} # https://stackoverflow.com/questions/58033366
156+
echo branch=$branch
149157
git init -q .
150158
git config --system --add safe.directory '*' # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
151159
git remote add origin $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
152-
git fetch origin $GITHUB_HEAD_REF
160+
git fetch origin $branch
153161
git reset --hard FETCH_HEAD
154162
git submodule update --init --recursive
155163
- run: c4core-install ${{matrix.cxx}}
@@ -199,10 +207,14 @@ jobs:
199207
- name: checkout
200208
run: |
201209
set -x
210+
echo GITHUB_REF=$GITHUB_REF
211+
echo GITHUB_HEAD_REF=$GITHUB_HEAD_REF
212+
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} # https://stackoverflow.com/questions/58033366
213+
echo branch=$branch
202214
git init -q .
203215
git config --system --add safe.directory '*' # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
204216
git remote add origin $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
205-
git fetch origin $GITHUB_HEAD_REF
217+
git fetch origin $branch
206218
git reset --hard FETCH_HEAD
207219
git submodule update --init --recursive
208220
- run: c4core-install ${{matrix.cxx}}
@@ -280,10 +292,14 @@ jobs:
280292
- name: checkout
281293
run: |
282294
set -x
295+
echo GITHUB_REF=$GITHUB_REF
296+
echo GITHUB_HEAD_REF=$GITHUB_HEAD_REF
297+
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} # https://stackoverflow.com/questions/58033366
298+
echo branch=$branch
283299
git init -q .
284300
git config --system --add safe.directory '*' # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
285301
git remote add origin $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
286-
git fetch origin $GITHUB_HEAD_REF
302+
git fetch origin $branch
287303
git reset --hard FETCH_HEAD
288304
git submodule update --init --recursive
289305
- run: c4core-install ${{matrix.cxx}}
@@ -389,10 +405,14 @@ jobs:
389405
- name: checkout
390406
run: |
391407
set -x
408+
echo GITHUB_REF=$GITHUB_REF
409+
echo GITHUB_HEAD_REF=$GITHUB_HEAD_REF
410+
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}} # https://stackoverflow.com/questions/58033366
411+
echo branch=$branch
392412
git init -q .
393413
git config --system --add safe.directory '*' # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
394414
git remote add origin $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
395-
git fetch origin $GITHUB_HEAD_REF
415+
git fetch origin $branch
396416
git reset --hard FETCH_HEAD
397417
git submodule update --init --recursive
398418
- name: install gcc-arm-linux-gnueabihf

0 commit comments

Comments
 (0)