Fix external & distfiles directory paths for CI
This commit is contained in:
parent
591959924f
commit
63c0a52067
|
@ -30,7 +30,7 @@ jobs:
|
||||||
uses: actions/cache/restore@v3
|
uses: actions/cache/restore@v3
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
externals/distfiles
|
distfiles
|
||||||
key: cache-${{ hashFiles('steps/*/sources') }}
|
key: cache-${{ hashFiles('steps/*/sources') }}
|
||||||
- name: Get sources
|
- name: Get sources
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
|
@ -40,7 +40,7 @@ jobs:
|
||||||
uses: actions/cache/save@v3
|
uses: actions/cache/save@v3
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
externals/distfiles
|
distfiles
|
||||||
key: cache-${{ hashFiles('steps/*/sources') }}
|
key: cache-${{ hashFiles('steps/*/sources') }}
|
||||||
- name: Run bootstrap
|
- name: Run bootstrap
|
||||||
run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass1
|
run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass1
|
||||||
|
@ -83,7 +83,7 @@ jobs:
|
||||||
uses: actions/cache/restore@v3
|
uses: actions/cache/restore@v3
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
externals/distfiles
|
distfiles
|
||||||
key: cache-${{ hashFiles('steps/*/sources') }}
|
key: cache-${{ hashFiles('steps/*/sources') }}
|
||||||
- name: Get sources
|
- name: Get sources
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
|
@ -93,7 +93,7 @@ jobs:
|
||||||
uses: actions/cache/save@v3
|
uses: actions/cache/save@v3
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
externals/distfiles
|
distfiles
|
||||||
key: cache-${{ hashFiles('steps/*/sources') }}
|
key: cache-${{ hashFiles('steps/*/sources') }}
|
||||||
- name: Run bootstrap
|
- name: Run bootstrap
|
||||||
run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass2
|
run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass2
|
||||||
|
@ -102,7 +102,7 @@ jobs:
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: internal_packages_pass2
|
name: internal_packages_pass2
|
||||||
path: tmp/externals/repo/**
|
path: tmp/external/repo/**
|
||||||
|
|
||||||
pass3:
|
pass3:
|
||||||
name: Run remaining builds under bubblewrap
|
name: Run remaining builds under bubblewrap
|
||||||
|
@ -129,13 +129,13 @@ jobs:
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: internal_packages_pass2
|
name: internal_packages_pass2
|
||||||
path: tmp/externals/repo-preseeded/
|
path: tmp/external/repo-preseeded/
|
||||||
- name: Query cache for sources
|
- name: Query cache for sources
|
||||||
id: cache
|
id: cache
|
||||||
uses: actions/cache/restore@v3
|
uses: actions/cache/restore@v3
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
externals/distfiles
|
distfiles
|
||||||
key: cache-${{ hashFiles('steps/*/sources') }}
|
key: cache-${{ hashFiles('steps/*/sources') }}
|
||||||
- name: Get sources
|
- name: Get sources
|
||||||
if: steps.cache.outputs.cache-hit != 'true'
|
if: steps.cache.outputs.cache-hit != 'true'
|
||||||
|
@ -145,7 +145,7 @@ jobs:
|
||||||
uses: actions/cache/save@v3
|
uses: actions/cache/save@v3
|
||||||
with:
|
with:
|
||||||
path: |
|
path: |
|
||||||
externals/distfiles
|
distfiles
|
||||||
key: cache-${{ hashFiles('steps/*/sources') }}
|
key: cache-${{ hashFiles('steps/*/sources') }}
|
||||||
- name: Run bootstrap
|
- name: Run bootstrap
|
||||||
run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass3
|
run: ./rootfs.py --bwrap --external-sources --build-kernels --preserve --cores 2 --internal-ci pass3
|
||||||
|
@ -154,4 +154,4 @@ jobs:
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: packages
|
name: packages
|
||||||
path: tmp/externals/repo/**
|
path: tmp/external/repo/**
|
||||||
|
|
Loading…
Reference in New Issue