Skip to content

Commit aa08131

Browse files
committed
ci: update workflow for new runners
Update workflow for new runners Signed-off-by: Anas Nashif <[email protected]>
1 parent 549b5b7 commit aa08131

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

.github/workflows/clang.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ jobs:
1313
container:
1414
image: zephyrprojectrtos/ci:v0.18.4
1515
options: '--entrypoint /bin/bash'
16-
volumes:
17-
- /repo-cache/zephyrproject:/github/cache/zephyrproject
1816
strategy:
1917
fail-fast: false
2018
matrix:
@@ -30,7 +28,7 @@ jobs:
3028
- name: Clone cached Zephyr repository
3129
continue-on-error: true
3230
run: |
33-
git clone --shared /github/cache/zephyrproject/zephyr .
31+
git clone --shared /repo-cache/cache/zephyrproject/zephyr .
3432
git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
3533
3634
- name: Checkout
@@ -55,7 +53,7 @@ jobs:
5553
# So first retry to update, if that does not work, remove all modules
5654
# and start over. (Workaround until we implement more robust module
5755
# west caching).
58-
west update --path-cache /github/cache/zephyrproject 2>&1 1> west.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west2.log || ( rm -rf ../modules && west update --path-cache /github/cache/zephyrproject)
56+
west update --path-cache /repo-cache/cache/zephyrproject 2>&1 1> west.log || west update --path-cache /repo-cache/cache/zephyrproject 2>&1 1> west2.log || ( rm -rf ../modules && west update --path-cache /repo-cache/cache/zephyrproject)
5957
6058
- name: Check Environment
6159
run: |

.github/workflows/codecov.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
container:
1616
image: zephyrprojectrtos/ci:v0.18.4
1717
options: '--entrypoint /bin/bash'
18-
volumes:
19-
- /repo-cache/zephyrproject:/github/cache/zephyrproject
2018
strategy:
2119
fail-fast: false
2220
matrix:
@@ -32,7 +30,7 @@ jobs:
3230
- name: Clone cached Zephyr repository
3331
continue-on-error: true
3432
run: |
35-
git clone --shared /github/cache/zephyrproject/zephyr .
33+
git clone --shared /repo-cache/cache/zephyrproject/zephyr .
3634
git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
3735
3836
- name: checkout

.github/workflows/twister.yaml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
container:
2323
image: zephyrprojectrtos/ci:v0.18.4
2424
options: '--entrypoint /bin/bash'
25-
volumes:
26-
- /repo-cache/zephyrproject:/github/cache/zephyrproject
2725
outputs:
2826
subset: ${{ steps.output-services.outputs.subset }}
2927
size: ${{ steps.output-services.outputs.size }}
@@ -41,7 +39,7 @@ jobs:
4139
if: github.event_name == 'pull_request_target'
4240
continue-on-error: true
4341
run: |
44-
git clone --shared /github/cache/zephyrproject/zephyr .
42+
git clone --shared /repo-cache/cache/zephyrproject/zephyr .
4543
git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
4644
4745
- name: Checkout
@@ -114,8 +112,6 @@ jobs:
114112
container:
115113
image: zephyrprojectrtos/ci:v0.18.4
116114
options: '--entrypoint /bin/bash'
117-
volumes:
118-
- /repo-cache/zephyrproject:/github/cache/zephyrproject
119115
strategy:
120116
fail-fast: false
121117
matrix:
@@ -133,7 +129,7 @@ jobs:
133129
- name: Clone cached Zephyr repository
134130
continue-on-error: true
135131
run: |
136-
git clone --shared /github/cache/zephyrproject/zephyr .
132+
git clone --shared /repo-cache/cache/zephyrproject/zephyr .
137133
git remote set-url origin ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}
138134
139135
- name: Checkout
@@ -156,7 +152,7 @@ jobs:
156152
157153
west init -l . || true
158154
west config --global update.narrow true
159-
west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /github/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules && west update --path-cache /github/cache/zephyrproject)
155+
west update --path-cache /repo-cache/cache/zephyrproject 2>&1 1> west.update.log || west update --path-cache /repo-cache/cache/zephyrproject 2>&1 1> west.update.log || ( rm -rf ../modules && west update --path-cache /repo-cache/cache/zephyrproject)
160156
west forall -c 'git reset --hard HEAD'
161157
162158
- name: Check Environment

0 commit comments

Comments
 (0)