From d3189bee943638f85569a354a3cdb8afeff6516b Mon Sep 17 00:00:00 2001 From: Lukas Greve Date: Sat, 19 Sep 2026 14:29:05 +0200 Subject: [PATCH] ci: consolidate ISO workflows into single dual-mode build-iso Merge build-iso.yaml and build-iso_more-recent.yaml into one workflow. - triggers: push to main (build + artifact) and v*.*.* tags (build + release) - parametrize Fedora version and dish via env - fix copyin source (cook/dishes/... .cfg) and artifact/release path (host path into the mock chroot, /var/lib/mock//root/var/lmc) - install cook Python deps in the build job before make all - drop build-iso_more-recent.yaml (superseded) --- .gitea/workflows/build-iso.yaml | 70 +++++++++++++-------- .gitea/workflows/build-iso_more-recent.yaml | 59 ----------------- 2 files changed, 45 insertions(+), 84 deletions(-) delete mode 100644 .gitea/workflows/build-iso_more-recent.yaml diff --git a/.gitea/workflows/build-iso.yaml b/.gitea/workflows/build-iso.yaml index f8e5f40..dff3404 100644 --- a/.gitea/workflows/build-iso.yaml +++ b/.gitea/workflows/build-iso.yaml @@ -3,72 +3,92 @@ name: build-iso on: push: branches: [main] - release: - types: [published] + tags: ["v*.*.*"] + +env: + FEDORA_VERSION: "44" + KICKSTART_FILE: desktop_44_standard_grub_gnome_guest-agents jobs: validate: runs-on: fedora + defaults: + run: + shell: bash container: image: git.phyllo.me/devops/fedora-runner-image:latest - + steps: - uses: https://git.phyllo.me/devops/checkout@v5 with: fetch-depth: 0 - - - name: Install dependencies - run: | - pip install PyYAML pykickstart - + + - name: Install Python deps + run: pip install -r cook/requirements.txt + - name: Generate, lint, and validate dishes run: | cd cook make all - + build-iso: needs: validate runs-on: fedora + defaults: + run: + shell: bash container: image: git.phyllo.me/devops/fedora-runner-image:latest - + steps: - uses: https://git.phyllo.me/devops/checkout@v5 with: fetch-depth: 0 - + + - name: Install Python deps + run: pip install -r cook/requirements.txt + - name: Initialize mock run: | - mock -r fedora-44-x86_64 --init - + mock -r fedora-${{ env.FEDORA_VERSION }}-x86_64 --init + - name: Install required packages run: | - mock -r fedora-44-x86_64 --install lorax-lmc-novirt vim-minimal pykickstart livecd-tools - + mock -r fedora-${{ env.FEDORA_VERSION }}-x86_64 --install lorax-lmc-novirt vim-minimal pykickstart livecd-tools + - name: Generate dishes run: | cd cook make all - + - name: Copy configuration file to mock run: | - mock -r fedora-44-x86_64 --copyin dishes/desktop_44_standard_grub_gnome_guest-agents.cfg /builddir - + mock -r fedora-${{ env.FEDORA_VERSION }}-x86_64 --copyin cook/dishes/${{ env.KICKSTART_FILE }}.cfg /builddir + - name: Build ISO with livemedia-creator run: | - mock -r fedora-44-x86_64 --shell --enable-network --isolation=simple << 'EOF' + mock -r fedora-${{ env.FEDORA_VERSION }}-x86_64 --shell --enable-network --isolation=simple << 'EOF' cd /builddir - livemedia-creator --ks desktop_44_standard_grub_gnome_guest-agents.cfg --no-virt --resultdir /var/lmc --project phyllomeos --make-iso --volid phyllomeos --iso-only --iso-name desktop-44.iso --releasever 44 --macboot + livemedia-creator --ks ${{ env.KICKSTART_FILE }}.cfg --no-virt --resultdir /var/lmc --project phyllomeos --make-iso --volid phyllomeos --iso-only --iso-name ${{ env.KICKSTART_FILE }}-${{ env.FEDORA_VERSION }}.iso --releasever ${{ env.FEDORA_VERSION }} --macboot EOF - + - name: Upload ISO as artifact + if: github.ref == 'refs/heads/main' uses: actions/upload-artifact@v3 with: - name: desktop-44.iso - path: /var/lmc/desktop-44.iso + name: ${{ env.KICKSTART_FILE }}-${{ env.FEDORA_VERSION }}.iso + path: /var/lib/mock/fedora-${{ env.FEDORA_VERSION }}-x86_64/root/var/lmc/${{ env.KICKSTART_FILE }}-${{ env.FEDORA_VERSION }}.iso if-no-files-found: error - + + - name: Publish ISO as release + if: startsWith(github.ref, 'refs/tags/') + uses: https://git.phyllo.me/devops/action-gh-release@v2 + with: + files: /var/lib/mock/fedora-${{ env.FEDORA_VERSION }}-x86_64/root/var/lmc/${{ env.KICKSTART_FILE }}-${{ env.FEDORA_VERSION }}.iso + draft: false + prerelease: false + - name: Cleanup mock environment if: always() run: | - mock -r fedora-44-x86_64 --clean + mock -r fedora-${{ env.FEDORA_VERSION }}-x86_64 --clean \ No newline at end of file diff --git a/.gitea/workflows/build-iso_more-recent.yaml b/.gitea/workflows/build-iso_more-recent.yaml deleted file mode 100644 index 1d6e38a..0000000 --- a/.gitea/workflows/build-iso_more-recent.yaml +++ /dev/null @@ -1,59 +0,0 @@ -name: release - -on: - push: - tags: - - "v*.*.*" - -env: - FEDORA_VERSION: 44 - KICKSTART_FILE: desktop_44_standard_grub_gnome_guest-agents - -jobs: - checkout: - runs-on: fedora - defaults: - run: - shell: bash - - steps: - - uses: https://git.phyllo.me/devops/checkout@v5 - with: - fetch-depth: 0 - - - name: Initialize mock - run: | - mock -r fedora-${{ env.FEDORA_VERSION }}-x86_64 --init - - - name: Install required packages - run: | - mock -r fedora-${{ env.FEDORA_VERSION }}-x86_64 --install lorax-lmc-novirt vim-minimal pykickstart livecd-tools - - - name: Generate dishes - run: | - cd cook - make all - - - name: Copy configuration file to mock - run: | - mock -r fedora-${{ env.FEDORA_VERSION }}-x86_64 --copyin dishes/${{ env.KICKSTART_FILE }} /builddir - - - name: Build ISO with livemedia-creator - run: | - mock -r fedora-${{ env.FEDORA_VERSION }}-x86_64 --shell --enable-network --isolation=simple << 'EOF' - cd /builddir - livemedia-creator --ks ${{ env.KICKSTART_FILE }}.cfg --no-virt --resultdir /var/lmc --project ${{ env.KICKSTART_FILE }} --make-iso --volid ${{ env.KICKSTART_FILE }} --iso-only --iso-name ${{ env.KICKSTART_FILE }}-${{ env.FEDORA_VERSION }}.iso --releasever ${{ env.FEDORA_VERSION }} --macboot - EOF - - - name: Release - uses: https://git.phyllo.me/devops/action-gh-release@v2 - if: github.ref_type == 'tag' - with: - files: /var/lib/mock/fedora-${{ env.FEDORA_VERSION }}-x86_64/root/var/lmc/${{ env.KICKSTART_FILE }}-${{ env.FEDORA_VERSION }}.iso - draft: false - prerelease: false - - - name: Cleanup mock environment - if: always() - run: | - mock -r fedora-${{ env.FEDORA_VERSION }}-x86_64 --clean