This commit is contained in:
MaxHearnden 2025-01-11 02:58:05 +00:00 committed by GitHub
commit d3e4fb4dbe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 111 additions and 23 deletions

View file

@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
name: Run under bubblewrap
name: Run under (bubble)wrap
on:
workflow_dispatch:
@ -13,10 +13,15 @@ on:
jobs:
pass1:
name: Run up to Linux build under bubblewrap
name: Run up to Linux build under (bubble)wrap
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
virt-tool: [bwrap, wrap]
steps:
- name: Install bubblewrap
if: matrix.virt-tool == 'bwrap'
run: sudo apt install bubblewrap
- name: Checkout repo
uses: actions/checkout@v4
@ -45,7 +50,7 @@ jobs:
distfiles
key: cache-${{ hashFiles('steps/*/sources') }}
- name: Run bootstrap
run: ./rootfs.py --bwrap --external-sources --build-kernels --cores 2 --internal-ci pass1
run: ./rootfs.py --${{matrix.virt-tool}} --external-sources --build-kernels --cores 2 --internal-ci pass1
- name: Archive created packages
if: failure() # archive failed builds progress
uses: actions/upload-artifact@v4
@ -57,15 +62,20 @@ jobs:
- name: Archive pass1_image
uses: actions/upload-artifact@v4
with:
name: internal_pass1_image
name: internal_pass1_image_${{matrix.virt-tool}}
path: pass1_image.tar
pass2:
name: Run up to Python bootstrap under bubblewrap
name: Run up to Python bootstrap under (bubble)wrap
needs: pass1
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
virt-tool: [bwrap, wrap]
steps:
- name: Install bubblewrap
if: matrix.virt-tool == 'bwrap'
run: sudo apt install bubblewrap
- name: Checkout repo
uses: actions/checkout@v4
@ -79,7 +89,7 @@ jobs:
- name: Get pass1_image
uses: actions/download-artifact@v4
with:
name: internal_pass1_image
name: internal_pass1_image_${{matrix.virt-tool}}
- name: Extract pass1_image
run: tar -xf pass1_image.tar
- name: Query cache for sources
@ -100,7 +110,7 @@ jobs:
distfiles
key: cache-${{ hashFiles('steps/*/sources') }}
- name: Run bootstrap
run: ./rootfs.py --bwrap --external-sources --build-kernels --cores 2 --internal-ci pass2
run: ./rootfs.py --${{matrix.virt-tool}} --external-sources --build-kernels --cores 2 --internal-ci pass2
- name: Archive created packages
if: failure() # archive failed builds progress
uses: actions/upload-artifact@v4
@ -112,15 +122,20 @@ jobs:
- name: Archive pass2_image
uses: actions/upload-artifact@v4
with:
name: internal_pass2_image
name: internal_pass2_image_${{matrix.virt-tool}}
path: pass2_image.tar
pass3:
name: Run remaining builds under bubblewrap
name: Run remaining builds under (bubble)wrap
needs: pass2
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
virt-tool: [bwrap, wrap]
steps:
- name: Install bubblewrap
if: matrix.virt-tool == 'bwrap'
run: sudo apt install bubblewrap
- name: Checkout repo
uses: actions/checkout@v4
@ -134,7 +149,7 @@ jobs:
- name: Get pass2_image
uses: actions/download-artifact@v4
with:
name: internal_pass2_image
name: internal_pass2_image_${{matrix.virt-tool}}
- name: Extract pass2_image
run: tar -xf pass2_image.tar
- name: Query cache for sources
@ -155,10 +170,10 @@ jobs:
distfiles
key: cache-${{ hashFiles('steps/*/sources') }}
- name: Run bootstrap
run: ./rootfs.py --bwrap --external-sources --build-kernels --cores 2 --internal-ci pass3
run: ./rootfs.py --${{matrix.virt-tool}} --external-sources --build-kernels --cores 2 --internal-ci pass3
- name: Archive created packages
if: always() # archive both failed and successful builds
uses: actions/upload-artifact@v4
with:
name: packages
name: packages_${{matrix.virt-tool}}
path: target/external/repo/**