mirror of
https://github.com/JasonN3/build-container-installer.git
synced 2025-12-25 10:57:55 +01:00
move to matrix var with new repos
This commit is contained in:
parent
c166a60cda
commit
68d80452e6
2 changed files with 28 additions and 21 deletions
22
.github/workflows/build_iso.yml
vendored
22
.github/workflows/build_iso.yml
vendored
|
|
@ -103,34 +103,28 @@ jobs:
|
||||||
- name: Build ISO
|
- name: Build ISO
|
||||||
uses: ./
|
uses: ./
|
||||||
id: build
|
id: build
|
||||||
env:
|
|
||||||
IMAGE_NAME: "${{ matrix.version == 'eln' && 'fedora-bootc' || needs.load_vars.outputs.IMAGE_NAME }}"
|
|
||||||
IMAGE_REPO: "${{ matrix.version == 'eln' && 'quay.io/centos-bootc' || needs.load_vars.outputs.IMAGE_REPO }}"
|
|
||||||
with:
|
with:
|
||||||
arch: ${{ needs.load_vars.outputs.ARCH }}
|
arch: ${{ needs.load_vars.outputs.ARCH }}
|
||||||
image_name: ${{ env.IMAGE_NAME }}
|
image_name: ${{ matrix.image_name }}
|
||||||
image_repo: ${{ env.IMAGE_REPO}}
|
image_repo: ${{ matrix.image_repo}}
|
||||||
image_tag: ${{ matrix.version }}
|
image_tag: ${{ matrix.version }}
|
||||||
version: ${{ matrix.version == 'eln' && '9' || matrix.version }}
|
version: ${{ matrix.version }}
|
||||||
repos: ${{ matrix.version == 'eln' && 'repos/centos.repo' || '' }}
|
repos: ${{ matrix.repos }}
|
||||||
variant: ${{ needs.load_vars.outputs.VARIANT }}
|
variant: ${{ needs.load_vars.outputs.VARIANT }}
|
||||||
flatpak_remote_refs: ${{ matrix.flatpaks == 'flatpak_refs' && needs.load_vars.outputs.FLATPAK_REMOTE_REFS || '' }}
|
flatpak_remote_refs: ${{ matrix.flatpaks == 'flatpak_refs' && needs.load_vars.outputs.FLATPAK_REMOTE_REFS || '' }}
|
||||||
flatpak_remote_refs_dir: ${{ matrix.flatpaks == 'flatpak_refs_dir' && needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR || '' }}
|
flatpak_remote_refs_dir: ${{ matrix.flatpaks == 'flatpak_refs_dir' && needs.load_vars.outputs.FLATPAK_REMOTE_REFS_DIR || '' }}
|
||||||
secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
|
secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }}
|
||||||
enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
|
enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
|
||||||
iso_name: build/${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso
|
iso_name: build/${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso
|
||||||
|
|
||||||
- name: Upload ISO as artifact
|
- name: Upload ISO as artifact
|
||||||
id: upload
|
id: upload
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
env:
|
|
||||||
IMAGE_NAME: "${{ matrix.version == 'eln' && 'fedora-bootc' || needs.load_vars.outputs.IMAGE_NAME }}"
|
|
||||||
IMAGE_REPO: "${{ matrix.version == 'eln' && 'quay.io/centos-bootc' || needs.load_vars.outputs.IMAGE_REPO }}"
|
|
||||||
with:
|
with:
|
||||||
name: ${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}
|
name: ${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}
|
||||||
path: |
|
path: |
|
||||||
build/${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso
|
build/${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso
|
||||||
build/${{ env.IMAGE_NAME }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso-CHECKSUM
|
build/${{ matrix.image_name }}-${{ matrix.version }}${{ matrix.flatpaks == 'false' && '' || format('-{0}', matrix.flatpaks) }}.iso-CHECKSUM
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
retention-days: 0
|
retention-days: 0
|
||||||
compression-level: 0
|
compression-level: 0
|
||||||
|
|
|
||||||
27
.github/workflows/build_vars.yml
vendored
27
.github/workflows/build_vars.yml
vendored
|
|
@ -12,7 +12,6 @@ on:
|
||||||
"38",
|
"38",
|
||||||
"39",
|
"39",
|
||||||
"40",
|
"40",
|
||||||
"eln"
|
|
||||||
],
|
],
|
||||||
"flatpaks": [
|
"flatpaks": [
|
||||||
"false",
|
"false",
|
||||||
|
|
@ -21,19 +20,33 @@ on:
|
||||||
],
|
],
|
||||||
"exclude": [
|
"exclude": [
|
||||||
{
|
{
|
||||||
"version": "eln",
|
"version": "40",
|
||||||
"flatpaks": "flatpak_dir"
|
"flatpaks": "flatpak_dir"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"version": "eln",
|
"version": "40",
|
||||||
"flatpaks": "flatpak_refs"
|
"flatpaks": "flatpak_refs"
|
||||||
}
|
}
|
||||||
|
],
|
||||||
|
"include": [
|
||||||
|
{
|
||||||
|
"version": "38",
|
||||||
|
"image_repo": "quay.io/fedora-ostree-desktops",
|
||||||
|
"image_name": "base"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "39",
|
||||||
|
"image_repo": "quay.io/fedora-ostree-desktops",
|
||||||
|
"image_name": "base"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"version": "40",
|
||||||
|
"image_repo": "quay.io/fedora",
|
||||||
|
"image_name": "fedora-bootc",
|
||||||
|
"repos": "repos/centos.repo"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
}'
|
}'
|
||||||
IMAGE_NAME:
|
|
||||||
value: 'base'
|
|
||||||
IMAGE_REPO:
|
|
||||||
value: 'quay.io/fedora-ostree-desktops'
|
|
||||||
VARIANT:
|
VARIANT:
|
||||||
value: 'Server'
|
value: 'Server'
|
||||||
FLATPAK_REMOTE_REFS_DIR:
|
FLATPAK_REMOTE_REFS_DIR:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue