Skip to content

Commit 10ea6c3

Browse files
committed
Modify GH actions to support mirror
1 parent e9c831c commit 10ea6c3

File tree

1 file changed

+12
-28
lines changed

1 file changed

+12
-28
lines changed

.github/workflows/bwrap.yml

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,24 @@ jobs:
3232
uses: actions/cache/restore@v4
3333
with:
3434
path: |
35-
distfiles
35+
mirror
36+
mirror-state
3637
key: cache-${{ hashFiles('steps/*/sources') }}
38+
restore-keys: |
39+
cache-
3740
- name: Get sources
3841
if: steps.cache.outputs.cache-hit != 'true'
39-
run: ./download-distfiles.sh
42+
run: mkdir -p mirror mirror-state && ./mirror.sh mirror mirror-state
4043
- name: Cache sources
4144
if: steps.cache.outputs.cache-hit != 'true'
4245
uses: actions/cache/save@v4
4346
with:
4447
path: |
45-
distfiles
48+
mirror
49+
mirror-state
4650
key: cache-${{ hashFiles('steps/*/sources') }}
4751
- name: Run bootstrap
48-
run: ./rootfs.py --bwrap --external-sources --build-kernels --cores 2 --internal-ci pass1
52+
run: ./rootfs.py --bwrap --external-sources --build-kernels --cores 2 --internal-ci pass1 --mirror file://${PWD}/mirror
4953
- name: Archive created packages
5054
if: failure() # archive failed builds progress
5155
uses: actions/upload-artifact@v4
@@ -87,20 +91,10 @@ jobs:
8791
uses: actions/cache/restore@v4
8892
with:
8993
path: |
90-
distfiles
91-
key: cache-${{ hashFiles('steps/*/sources') }}
92-
- name: Get sources
93-
if: steps.cache.outputs.cache-hit != 'true'
94-
run: ./download-distfiles.sh
95-
- name: Cache sources
96-
if: steps.cache.outputs.cache-hit != 'true'
97-
uses: actions/cache/save@v4
98-
with:
99-
path: |
100-
distfiles
94+
mirror
10195
key: cache-${{ hashFiles('steps/*/sources') }}
10296
- name: Run bootstrap
103-
run: ./rootfs.py --bwrap --external-sources --build-kernels --cores 2 --internal-ci pass2
97+
run: ./rootfs.py --bwrap --external-sources --build-kernels --cores 2 --internal-ci pass2 --mirror file://${PWD}/mirror
10498
- name: Archive created packages
10599
if: failure() # archive failed builds progress
106100
uses: actions/upload-artifact@v4
@@ -142,20 +136,10 @@ jobs:
142136
uses: actions/cache/restore@v4
143137
with:
144138
path: |
145-
distfiles
146-
key: cache-${{ hashFiles('steps/*/sources') }}
147-
- name: Get sources
148-
if: steps.cache.outputs.cache-hit != 'true'
149-
run: ./download-distfiles.sh
150-
- name: Cache sources
151-
if: steps.cache.outputs.cache-hit != 'true'
152-
uses: actions/cache/save@v4
153-
with:
154-
path: |
155-
distfiles
139+
mirror
156140
key: cache-${{ hashFiles('steps/*/sources') }}
157141
- name: Run bootstrap
158-
run: ./rootfs.py --bwrap --external-sources --build-kernels --cores 2 --internal-ci pass3
142+
run: ./rootfs.py --bwrap --external-sources --build-kernels --cores 2 --internal-ci pass3 --mirror file://${PWD}/mirror
159143
- name: Archive created packages
160144
if: always() # archive both failed and successful builds
161145
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)