From 34f00b4072a2f9b1031c118e313f2c1004f6afc1 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 20:53:35 +0100 Subject: [PATCH 01/23] fix: Update release-iso.yml to use new iso action --- .github/workflows/release-iso.yml | 66 +++++++++++++++---------------- 1 file changed, 31 insertions(+), 35 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index dc8f9e0..60f4ffe 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -1,47 +1,43 @@ on: - push: - paths: - - 'boot_menu.yml' - - '.github/workflows/release-iso.yml' workflow_dispatch: + +env: + REGISTRY: ghcr.io + FEDORA_VERSION: 41 + name: release-iso jobs: release-iso: name: Generate and Release ISOs runs-on: ubuntu-latest permissions: - contents: write - container: - image: fedora:39 - options: --privileged + contents: read + packages: write + id-token: write steps: - uses: actions/checkout@v4 - - name: Generate ISO - uses: ublue-os/isogenerator@v2.3.1 - id: isogenerator + + - name: Build ISO + uses: jasonn3/build-container-installer@main + id: build + with: + arch: x86_64 + image_name: ${{ github.event.repository.name }} + image_repo: ${{ env.REGISTRY }} + image_tag: ${{ github.sha }} + version: ${{ env.FEDORA_VERSION }} + variant: ${{ github.event.repository.name }} + iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}-${{ github.sha }}.iso + + - name: Upload ISO as artifact + id: upload + uses: actions/upload-artifact@v4 with: - image-name: ${{ github.event.repository.name }} - installer-repo: releases - installer-major-version: 39 - boot-menu-path: boot_menu.yml - - name: install github CLI - run: | - sudo dnf install 'dnf-command(config-manager)' -y - sudo dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo - sudo dnf install gh -y - - name: Upload ISO - env: - GITHUB_TOKEN: ${{ github.token }} - run: | - if gh release list -R ${{ github.repository_owner }}/${{ github.event.repository.name }} | grep "auto-iso"; then - gh release view auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} - gh release upload auto-iso ${{ steps.isogenerator.outputs.iso-path }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber - else - gh release create auto-iso ${{ steps.isogenerator.outputs.iso-path }} -t ISO -n "This is an automatically generated ISO release." -R ${{ github.repository_owner }}/${{ github.event.repository.name }} - fi - - name: Upload SHA256SUM - env: - GITHUB_TOKEN: ${{ github.token }} - run: - gh release upload auto-iso ${{ steps.isogenerator.outputs.sha256sum-path }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber + name: ${{ steps.build.outputs.iso_name }} + path: | + ${{ steps.build.outputs.iso_path }} + ${{ steps.build.outputs.iso_path }}-CHECKSUM + if-no-files-found: error + retention-days: 0 + compression-level: 0 From 8fc7c34c52ce368f57e3382e6cccb83c8319c4b5 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 20:57:03 +0100 Subject: [PATCH 02/23] fix: shorter iso name --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 60f4ffe..5eb94a3 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -28,7 +28,7 @@ jobs: image_tag: ${{ github.sha }} version: ${{ env.FEDORA_VERSION }} variant: ${{ github.event.repository.name }} - iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}-${{ github.sha }}.iso + iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}-${{ env.FEDORA_VERSION }}.iso - name: Upload ISO as artifact id: upload From fe4f59ddd7d9093c8973b683b109cfa58274c8de Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 21:05:13 +0100 Subject: [PATCH 03/23] fix: shorter volid name --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 5eb94a3..b445c84 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -25,7 +25,7 @@ jobs: arch: x86_64 image_name: ${{ github.event.repository.name }} image_repo: ${{ env.REGISTRY }} - image_tag: ${{ github.sha }} + image_tag: latest version: ${{ env.FEDORA_VERSION }} variant: ${{ github.event.repository.name }} iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}-${{ env.FEDORA_VERSION }}.iso From 5f8d250e1d5b5a1a63e5df2d18960f22360f0225 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 21:19:05 +0100 Subject: [PATCH 04/23] fix: something --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index b445c84..9b5bcc0 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -23,7 +23,7 @@ jobs: id: build with: arch: x86_64 - image_name: ${{ github.event.repository.name }} + image_name: ${{ github.repository }} image_repo: ${{ env.REGISTRY }} image_tag: latest version: ${{ env.FEDORA_VERSION }} From 72cd699f21a348db56f4c55727092c2463cb333f Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 21:42:19 +0100 Subject: [PATCH 05/23] fix: repository name --- .github/workflows/release-iso.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 9b5bcc0..88483a2 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -23,8 +23,8 @@ jobs: id: build with: arch: x86_64 - image_name: ${{ github.repository }} - image_repo: ${{ env.REGISTRY }} + image_name: ${{ github.repository.name }} + image_repo: ${{ env.REGISTRY }}/${{ github.repository_owner }} image_tag: latest version: ${{ env.FEDORA_VERSION }} variant: ${{ github.event.repository.name }} From b033f84af4f503f8c680ba61b1ba9cccf0703205 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 21:48:09 +0100 Subject: [PATCH 06/23] Update release-iso.yml --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 88483a2..d99b7ef 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -23,7 +23,7 @@ jobs: id: build with: arch: x86_64 - image_name: ${{ github.repository.name }} + image_name: ${{ github.event.repository.name }} image_repo: ${{ env.REGISTRY }}/${{ github.repository_owner }} image_tag: latest version: ${{ env.FEDORA_VERSION }} From e7c96c523006561281c9a741f929a25ad65ddf6e Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 22:47:29 +0100 Subject: [PATCH 07/23] Update release-iso.yml --- .github/workflows/release-iso.yml | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index d99b7ef..65883a0 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -30,14 +30,23 @@ jobs: variant: ${{ github.event.repository.name }} iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}-${{ env.FEDORA_VERSION }}.iso - - name: Upload ISO as artifact - id: upload - uses: actions/upload-artifact@v4 - with: - name: ${{ steps.build.outputs.iso_name }} - path: | - ${{ steps.build.outputs.iso_path }} - ${{ steps.build.outputs.iso_path }}-CHECKSUM - if-no-files-found: error - retention-days: 0 - compression-level: 0 + - name: install github CLI + run: | + sudo dnf install 'dnf-command(config-manager)' -y + sudo dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo + sudo dnf install gh -y + - name: Upload ISO + env: + GITHUB_TOKEN: ${{ github.token }} + run: | + if gh release list -R ${{ github.repository_owner }}/${{ github.event.repository.name }} | grep "auto-iso"; then + gh release view auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} + gh release upload auto-iso ${{ steps.build.outputs.iso_path }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber + else + gh release create auto-iso ${{ steps.build.outputs.iso_path }} -t ISO -n "This is an automatically generated ISO release." -R ${{ github.repository_owner }}/${{ github.event.repository.name }} + fi + - name: Upload SHA256SUM + env: + GITHUB_TOKEN: ${{ github.token }} + run: + gh release upload auto-iso ${{ steps.build.outputs.iso_path }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber From ee18bcdcc2ea4a7e6641eeaa0bd154643058c30b Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 22:47:50 +0100 Subject: [PATCH 08/23] Update release-iso.yml --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 65883a0..a112989 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -28,7 +28,7 @@ jobs: image_tag: latest version: ${{ env.FEDORA_VERSION }} variant: ${{ github.event.repository.name }} - iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}-${{ env.FEDORA_VERSION }}.iso + iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}.iso - name: install github CLI run: | From 3afe320d2c0addea04118ddb8aaa156186615271 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 23:03:53 +0100 Subject: [PATCH 09/23] Update release-iso.yml --- .github/workflows/release-iso.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index a112989..ceee19b 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -30,14 +30,9 @@ jobs: variant: ${{ github.event.repository.name }} iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}.iso - - name: install github CLI - run: | - sudo dnf install 'dnf-command(config-manager)' -y - sudo dnf config-manager --add-repo https://cli.github.com/packages/rpm/gh-cli.repo - sudo dnf install gh -y - name: Upload ISO env: - GITHUB_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ github.token }} run: | if gh release list -R ${{ github.repository_owner }}/${{ github.event.repository.name }} | grep "auto-iso"; then gh release view auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} @@ -47,6 +42,6 @@ jobs: fi - name: Upload SHA256SUM env: - GITHUB_TOKEN: ${{ github.token }} + GH_TOKEN: ${{ github.token }} run: gh release upload auto-iso ${{ steps.build.outputs.iso_path }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber From d3de0a05dd9d6abbe22cb9b6295d96c5ee6b8e58 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 23:20:24 +0100 Subject: [PATCH 10/23] Update release-iso.yml --- .github/workflows/release-iso.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index ceee19b..c33f1bd 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -12,7 +12,7 @@ jobs: name: Generate and Release ISOs runs-on: ubuntu-latest permissions: - contents: read + contents: write packages: write id-token: write steps: @@ -40,8 +40,4 @@ jobs: else gh release create auto-iso ${{ steps.build.outputs.iso_path }} -t ISO -n "This is an automatically generated ISO release." -R ${{ github.repository_owner }}/${{ github.event.repository.name }} fi - - name: Upload SHA256SUM - env: - GH_TOKEN: ${{ github.token }} - run: gh release upload auto-iso ${{ steps.build.outputs.iso_path }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber From 8128dfb9a678ff2f7eb80a317abb73c621fa20b4 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 23:41:40 +0100 Subject: [PATCH 11/23] Update release-iso.yml --- .github/workflows/release-iso.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index c33f1bd..074f35d 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -36,8 +36,8 @@ jobs: run: | if gh release list -R ${{ github.repository_owner }}/${{ github.event.repository.name }} | grep "auto-iso"; then gh release view auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} - gh release upload auto-iso ${{ steps.build.outputs.iso_path }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber + gh release upload auto-iso ${{ steps.build.outputs.iso_path }}${{ steps.build.outputs.iso_name }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber else - gh release create auto-iso ${{ steps.build.outputs.iso_path }} -t ISO -n "This is an automatically generated ISO release." -R ${{ github.repository_owner }}/${{ github.event.repository.name }} + gh release create auto-iso ${{ steps.build.outputs.iso_path }}${{ steps.build.outputs.iso_name }} -t ISO -n "This is an automatically generated ISO release." -R ${{ github.repository_owner }}/${{ github.event.repository.name }} fi - gh release upload auto-iso ${{ steps.build.outputs.iso_path }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber + gh release upload auto-iso ${{ steps.build.outputs.iso_path }}${{ steps.build.outputs.iso_name }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber From ca75c7a3d69cce143029ae94511abc9fd913d416 Mon Sep 17 00:00:00 2001 From: William Date: Thu, 16 Jan 2025 23:55:24 +0100 Subject: [PATCH 12/23] Update release-iso.yml --- .github/workflows/release-iso.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 074f35d..5331bd9 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -34,10 +34,11 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | + tree ${{ steps.build.outputs.iso_path }} if gh release list -R ${{ github.repository_owner }}/${{ github.event.repository.name }} | grep "auto-iso"; then gh release view auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} - gh release upload auto-iso ${{ steps.build.outputs.iso_path }}${{ steps.build.outputs.iso_name }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber + gh release upload auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber else - gh release create auto-iso ${{ steps.build.outputs.iso_path }}${{ steps.build.outputs.iso_name }} -t ISO -n "This is an automatically generated ISO release." -R ${{ github.repository_owner }}/${{ github.event.repository.name }} + gh release create auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} -t ISO -n "This is an automatically generated ISO release." -R ${{ github.repository_owner }}/${{ github.event.repository.name }} fi - gh release upload auto-iso ${{ steps.build.outputs.iso_path }}${{ steps.build.outputs.iso_name }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber + gh release upload auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber From 05e80484a4ba5035be2eac36bfc0339a73dd6583 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 17 Jan 2025 20:02:13 +0100 Subject: [PATCH 13/23] Update Containerfile --- Containerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 37d059d..b0e7fcc 100644 --- a/Containerfile +++ b/Containerfile @@ -1,6 +1,6 @@ ARG OS_VERSION=41 -FROM ghcr.io/ublue-os/sericea-main:$OS_VERSION +FROM quay.io/repository/fedora-ostree-desktops/sway-atomic:$OS_VERSION ARG OS_VERSION ENV OS_VERSION=$OS_VERSION @@ -14,7 +14,6 @@ ENV GITHUB_PR_HEAD_SHA=$GITHUB_PR_HEAD_SHA ARG GITHUB_REF_NAME ENV GITHUB_REF_NAME=$GITHUB_REF_NAME - COPY files/usr /usr # Swap SDDM for GDM From c94a75cce7c4ed34369dc7599b4190728f430598 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 17 Jan 2025 20:04:05 +0100 Subject: [PATCH 14/23] Update release-iso.yml --- .github/workflows/release-iso.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 5331bd9..f60d482 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -1,5 +1,10 @@ on: workflow_dispatch: + inputs: + imageTag: + required: true + type: string + default: 'latest' env: @@ -25,7 +30,7 @@ jobs: arch: x86_64 image_name: ${{ github.event.repository.name }} image_repo: ${{ env.REGISTRY }}/${{ github.repository_owner }} - image_tag: latest + image_tag: ${{ github.event.inputs.imageTag }} version: ${{ env.FEDORA_VERSION }} variant: ${{ github.event.repository.name }} iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}.iso From 381b2f9af375bc8cc41d9b8b159c60beee1fe5fb Mon Sep 17 00:00:00 2001 From: William Date: Fri, 17 Jan 2025 20:47:39 +0100 Subject: [PATCH 15/23] Update Containerfile --- Containerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index b0e7fcc..6cc84da 100644 --- a/Containerfile +++ b/Containerfile @@ -1,6 +1,6 @@ ARG OS_VERSION=41 -FROM quay.io/repository/fedora-ostree-desktops/sway-atomic:$OS_VERSION +FROM quay.io/fedora-ostree-desktops/sway-atomic:$OS_VERSION ARG OS_VERSION ENV OS_VERSION=$OS_VERSION @@ -14,6 +14,7 @@ ENV GITHUB_PR_HEAD_SHA=$GITHUB_PR_HEAD_SHA ARG GITHUB_REF_NAME ENV GITHUB_REF_NAME=$GITHUB_REF_NAME + COPY files/usr /usr # Swap SDDM for GDM From 4f335b0a741bcb69206c5b2e3ad3fcf0af7446dd Mon Sep 17 00:00:00 2001 From: William Date: Fri, 17 Jan 2025 20:59:04 +0100 Subject: [PATCH 16/23] Update Containerfile --- Containerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 6cc84da..5c2511c 100644 --- a/Containerfile +++ b/Containerfile @@ -20,11 +20,11 @@ COPY files/usr /usr # Swap SDDM for GDM RUN \ dnf remove -y sddm sddm-wayland-sway && \ - dnf install gdm && \ + dnf install -y gdm && \ systemctl enable gdm # Misc. packages -RUN dnf install \ +RUN dnf install -y \ fish \ kubernetes-client \ grim \ @@ -34,7 +34,7 @@ RUN dnf install \ # Docker RUN curl -o "/etc/yum.repos.d/docker.com.linux.fedora.docker-ce.repo" "https://download.docker.com/linux/fedora/docker-ce.repo" && \ - dnf install docker-ce docker-ce-cli && \ + dnf install -y docker-ce docker-ce-cli && \ systemctl enable docker # Fingerprint reader setup From 8fc61adeabe53c75987d52a6727c0c2da1702b48 Mon Sep 17 00:00:00 2001 From: William Date: Fri, 17 Jan 2025 22:02:10 +0100 Subject: [PATCH 17/23] Update release-iso.yml --- .github/workflows/release-iso.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index f60d482..adf49b1 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -39,11 +39,10 @@ jobs: env: GH_TOKEN: ${{ github.token }} run: | - tree ${{ steps.build.outputs.iso_path }} if gh release list -R ${{ github.repository_owner }}/${{ github.event.repository.name }} | grep "auto-iso"; then gh release view auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} - gh release upload auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber else gh release create auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} -t ISO -n "This is an automatically generated ISO release." -R ${{ github.repository_owner }}/${{ github.event.repository.name }} fi + gh release upload auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber gh release upload auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber From abde0d6635571fcf2a1cb768e74ea7dac3c92f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Lev=C3=A9n?= Date: Sat, 18 Jan 2025 12:18:06 +0100 Subject: [PATCH 18/23] fix: maybe this time... --- .github/workflows/release-iso.yml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index adf49b1..7eef3b4 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -5,11 +5,14 @@ on: required: true type: string default: 'latest' + description: 'The tag of the container-image to bundle in the ISO' env: REGISTRY: ghcr.io FEDORA_VERSION: 41 + DISTRIBUTION_BUCKET_LOCATION: gs://sediment-distribution-static-site-a658b18/downloads + DISTRIBUTION_ENDPOINT: https://storage.googleapis.com/sediment-distribution-static-site-a658b18/downloads name: release-iso jobs: @@ -35,14 +38,26 @@ jobs: variant: ${{ github.event.repository.name }} iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}.iso - - name: Upload ISO + - name: Set up Google Cloud SDK + uses: google-github-actions/setup-gcloud@master + with: + service_account_key: ${{ secrets.GCP_ACCOUNT_KEY }} + project_id: ${{ secrets.GCP_PROJECT_ID }} + export_default_credentials: true + + - name: Upload ISO to GCP Bucket + run : | + gsutil cp ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} ${{ env.DISTRIBUTION_BUCKET_LOCATION }}/${{ steps.build.outputs.iso_name }} + + + - name: Create Github Release env: GH_TOKEN: ${{ github.token }} run: | if gh release list -R ${{ github.repository_owner }}/${{ github.event.repository.name }} | grep "auto-iso"; then gh release view auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} else - gh release create auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} -t ISO -n "This is an automatically generated ISO release." -R ${{ github.repository_owner }}/${{ github.event.repository.name }} + gh release create auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} -t ISO -R ${{ github.repository_owner }}/${{ github.event.repository.name }} fi - gh release upload auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber gh release upload auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber + gh relese edit auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --title "Auto ISO" --notes "ISO-file: ${{ env.DISTRIBUTION_ENDPOINT }}/${{ steps.build.outputs.iso_name }} " --clobber From 458145fe7d58748ca9bb7cb6e7570cd8d1fde209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Lev=C3=A9n?= Date: Sat, 18 Jan 2025 12:22:33 +0100 Subject: [PATCH 19/23] fix: maybe this time... --- .github/workflows/release-iso.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 7eef3b4..678732d 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -38,12 +38,17 @@ jobs: variant: ${{ github.event.repository.name }} iso_name: ${{ github.event.repository.name }}-${{ env.FEDORA_VERSION }}.iso - - name: Set up Google Cloud SDK - uses: google-github-actions/setup-gcloud@master + + - name: 'Authenticate to Google Cloud' + uses: 'google-github-actions/auth@v2' + with: + credentials_json: '${{ secrets.GCP_ACCOUNT_KEY }}' + + - name: 'Set up Cloud SDK' + uses: 'google-github-actions/setup-gcloud@v2' with: - service_account_key: ${{ secrets.GCP_ACCOUNT_KEY }} - project_id: ${{ secrets.GCP_PROJECT_ID }} - export_default_credentials: true + version: '>= 363.0.0' + project_id: ${{ env.GCP_PROJECT_ID }} - name: Upload ISO to GCP Bucket run : | From 415fe84f42c79c651d111d84b88ede6e6bb02dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Lev=C3=A9n?= Date: Sat, 18 Jan 2025 12:50:58 +0100 Subject: [PATCH 20/23] fix: maybe this time... --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 678732d..ec1093d 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -62,7 +62,7 @@ jobs: if gh release list -R ${{ github.repository_owner }}/${{ github.event.repository.name }} | grep "auto-iso"; then gh release view auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --json assets -q .assets[].name | xargs -L 1 gh release delete-asset auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} else - gh release create auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }} -t ISO -R ${{ github.repository_owner }}/${{ github.event.repository.name }} + gh release create auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} fi gh release upload auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber gh relese edit auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --title "Auto ISO" --notes "ISO-file: ${{ env.DISTRIBUTION_ENDPOINT }}/${{ steps.build.outputs.iso_name }} " --clobber From 18d64e0f7767eda58127844f8cedef2d1b5a1353 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Lev=C3=A9n?= Date: Sat, 18 Jan 2025 13:48:27 +0100 Subject: [PATCH 21/23] fix: maybe this time... --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index ec1093d..2703117 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -65,4 +65,4 @@ jobs: gh release create auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} fi gh release upload auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber - gh relese edit auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --title "Auto ISO" --notes "ISO-file: ${{ env.DISTRIBUTION_ENDPOINT }}/${{ steps.build.outputs.iso_name }} " --clobber + gh release edit auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --title "Auto ISO" --notes "ISO-file: ${{ env.DISTRIBUTION_ENDPOINT }}/${{ steps.build.outputs.iso_name }} " --clobber From 325418b97bd51c467c3eb3182cb99be93d0053e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Lev=C3=A9n?= Date: Sat, 18 Jan 2025 17:05:57 +0100 Subject: [PATCH 22/23] fix: maybe this time... --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 2703117..86a67a8 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -65,4 +65,4 @@ jobs: gh release create auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} fi gh release upload auto-iso ${{ steps.build.outputs.iso_path }}/${{ steps.build.outputs.iso_name }}-CHECKSUM -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber - gh release edit auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --title "Auto ISO" --notes "ISO-file: ${{ env.DISTRIBUTION_ENDPOINT }}/${{ steps.build.outputs.iso_name }} " --clobber + gh release edit auto-iso -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --title "Auto ISO" --notes "ISO-file: ${{ env.DISTRIBUTION_ENDPOINT }}/${{ steps.build.outputs.iso_name }}" From 09291d2092e458e6b8475c656465dc97a799d273 Mon Sep 17 00:00:00 2001 From: William Date: Mon, 25 May 2026 20:53:55 +0200 Subject: [PATCH 23/23] Update Fedora version to 44 in release workflow --- .github/workflows/release-iso.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-iso.yml b/.github/workflows/release-iso.yml index 86a67a8..01dac36 100644 --- a/.github/workflows/release-iso.yml +++ b/.github/workflows/release-iso.yml @@ -10,7 +10,7 @@ on: env: REGISTRY: ghcr.io - FEDORA_VERSION: 41 + FEDORA_VERSION: 44 DISTRIBUTION_BUCKET_LOCATION: gs://sediment-distribution-static-site-a658b18/downloads DISTRIBUTION_ENDPOINT: https://storage.googleapis.com/sediment-distribution-static-site-a658b18/downloads