From f96a6fe3f8852959d1e162483c104db190084f41 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:31:08 -0400 Subject: [PATCH] add fedora eln --- .github/workflows/build_iso.yml | 10 ++++++---- .github/workflows/build_vars.yml | 4 +--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 54e309f..98e1c46 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -111,14 +111,15 @@ jobs: echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin - name: Build ISO + if: matrix.version != 'eln' || ( inputs.flatpak_remote_refs_dir == '' && inputs.flatpaks_refs == '') uses: ./ id: build with: arch: ${{ needs.load_vars.outputs.ARCH }} - image_name: ${{ needs.load_vars.outputs.IMAGE_NAME }} - image_repo: ${{ needs.load_vars.outputs.IMAGE_REPO }} - image_tag: ${{ matrix.version }} - version: ${{ matrix.version }} + 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 }} + image_tag: ${{ matrix.version || matrix.version }} + version: ${{ matrix.version == 'eln' && '39' || matrix.version }} variant: ${{ needs.load_vars.outputs.VARIANT }} flatpak_remote_refs: ${{ inputs.flatpaks_refs }} flatpak_remote_refs_dir: ${{ inputs.flatpaks_refs_dir }} @@ -127,6 +128,7 @@ jobs: iso_name: build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}${{ inputs.suffix && format('-{0}', inputs.suffix || '') }}.iso - name: Upload ISO as artifact + if: matrix.version != 'eln' || ( inputs.flatpak_remote_refs_dir == '' && inputs.flatpaks_refs == '') id: upload uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/build_vars.yml b/.github/workflows/build_vars.yml index ce4e273..2297364 100644 --- a/.github/workflows/build_vars.yml +++ b/.github/workflows/build_vars.yml @@ -6,13 +6,11 @@ on: ARCH: value: 'x86_64' BUILD_VERSIONS: - value: '[38, 39, 40]' + value: '[38, 39, 40, eln]' IMAGE_NAME: value: 'base' IMAGE_REPO: value: 'quay.io/fedora-ostree-desktops' - IMAGE_TAG: - value: '39' VARIANT: value: 'Server' FLATPAK_REMOTE_REFS_DIR: