1
0
Fork 0
mirror of https://github.com/JasonN3/build-container-installer.git synced 2025-12-25 10:57:55 +01:00

Merge branch 'main' into flatpak

This commit is contained in:
Jason N 2024-03-07 12:19:02 -06:00 committed by GitHub
commit de4b0eb26b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 38 additions and 15 deletions

View file

@ -13,7 +13,7 @@ env:
ARCH: 'x86_64'
IMAGE_NAME: 'base'
IMAGE_REPO: 'quay.io/fedora-ostree-desktops'
VERSION: '39'
IMAGE_TAG: '39'
VARIANT: 'Server'
FLATPAK_REMOTE_REFS: app/org.videolan.VLC/x86_64/stable
SECURE_BOOT_KEY_URL: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
@ -64,6 +64,11 @@ jobs:
permissions:
contents: read
packages: write
strategy:
matrix:
version:
- 38
- 39
steps:
- name: Checkout repo
uses: actions/checkout@v4
@ -88,7 +93,8 @@ jobs:
arch: ${{ env.ARCH}}
image_name: ${{ env.IMAGE_NAME}}
image_repo: ${{ env.IMAGE_REPO}}
version: ${{ env.VERSION }}
image_tag: ${{ env.IMAGE_TAG }}
version: ${{ matrix.version }}
variant: ${{ env.VARIANT }}
flatpak_remote_refs: ${{ env.FLATPAK_REMOTE_REFS }}
secure_boot_key_url: ${{ env.SECURE_BOOT_KEY_URL }}
@ -96,13 +102,13 @@ jobs:
- name: Rename ISO
run: |
mv build/deploy.iso build/${{ env.IMAGE_NAME }}-${{ env.VERSION }}.iso
mv build/deploy.iso build/${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}-${{ matrix.version }}.iso
- name: Upload ISO as artifact
id: upload
uses: actions/upload-artifact@v4
with:
name: ${{ env.IMAGE_NAME }}-${{ env.VERSION }}.iso
name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}-${{ matrix.version }}.iso
path: build/*.iso
if-no-files-found: error
retention-days: 0
@ -116,6 +122,11 @@ jobs:
permissions:
contents: read
packages: write
strategy:
matrix:
version:
- 38
- 39
steps:
- name: Checkout repo
uses: actions/checkout@v4
@ -132,15 +143,15 @@ jobs:
- name: Download generated ISO
uses: actions/download-artifact@v4
with:
name: ${{ env.IMAGE_NAME }}-${{ env.VERSION }}.iso
name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}-${{ matrix.version }}.iso
- name: Verify ISO
run: checkisomd5 ${{ env.IMAGE_NAME }}-${{ env.VERSION }}.iso
run: checkisomd5 ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}-${{ matrix.version }}.iso
- name: Run ISO checks
run: |
mv ${{ env.IMAGE_NAME }}-${{ env.VERSION }}.iso deploy.iso
make test-iso FLATPAK_REMOTE_REFS=${{ env.FLATPAK_REMOTE_REFS}}
mv ${{ env.IMAGE_NAME }}-${{ env.VERSION }}-${{ matrix.version }}.iso deploy.iso
make test-iso VERSION=${{ matrix.version }} FLATPAK_REMOTE_REFS=${{ env.FLATPAK_REMOTE_REFS}}
- name: Add Kickstart and Grub options to ISO
run: |