fix(iso): Get Anaconda ISOs updated (#445)

* fix(iso): Get Anaconda ISOs updated (#2485)

Signed-off-by: m2 <69128853+m2Giles@users.noreply.github.com>
Co-authored-by: m2 <69128853+m2Giles@users.noreply.github.com>

* fixup

* remove unneeded comment

Co-authored-by: Adam Fidel <ledif@users.noreply.github.com>

* iso naming to way it was

* fix iso workflow naming

* remove the unneeded iso build from HWE image workflow

* same for stable

* rename stable iso workflow

---------

Signed-off-by: m2 <69128853+m2Giles@users.noreply.github.com>
Co-authored-by: Jorge O. Castro <jorge.castro@gmail.com>
Co-authored-by: m2 <69128853+m2Giles@users.noreply.github.com>
Co-authored-by: Adam Fidel <ledif@users.noreply.github.com>

.github/renovate.json5

@@ -6,6 +6,18 @@
 
   // Do not rebase when the default branch is updated
   "rebaseWhen": "never",
+    customManagers: [
+    {
+      customType: 'regex',
+      managerFilePatterns: [
+        '/^Justfile$/',
+      ],
+      matchStrings: [
+        '(?<justName>.+?)\\s:=\\s"(?<packageName>\\S+):(?<currentValue>\\S+)@(?<currentDigest>sha256:[a-f0-9]+?)"',
+      ],
+      datasourceTemplate: 'docker',
+    },
+    ],
 
   "packageRules": [
     {
@@ -18,11 +30,9 @@
       "matchUpdateTypes": ["digest"]
     },
     {
-      // Do not pin digest for jasonn3/build-container-installer GitHub Action since Docker
-      // images are not tagged with the commit sha
       "matchUpdateTypes": ["pin", "digest", "pinDigest"],
-      "matchPackageNames": ["jasonn3/build-container-installer"],
-      "enabled": false
+      "matchPackageNames": ["ghcr.io/jasonn3/build-container-installer", "ghcr.io/hhd-dev/rechunk"],
+      "automerge": false
     },
     {
       "automerge": true,

.github/workflows/build-image-latest-hwe.yml

@@ -32,11 +32,3 @@ jobs:
     uses: ./.github/workflows/generate-release.yml
     with:
       stream_name: '["latest"]'
-
-  build-iso-latest:
-    name: Build Latest ISOs
-    needs: [build-image-latest]
-    if: github.event.schedule == '40 4 * * 0'
-
-    secrets: inherit
-    uses: ./.github/workflows/build-iso-latest.yml

.github/workflows/build-image-stable.yml

@@ -33,10 +33,3 @@ jobs:
     uses: ./.github/workflows/generate-release.yml
     with:
       stream_name: '["stable", "stable-daily"]'
-
-  build-iso-stable:
-    name: Build Stable ISOs
-    needs: [build-image-stable]
-    if: github.event.schedule == '45 5 * * 0'
-    secrets: inherit
-    uses: ./.github/workflows/build-iso-stable.yml

.github/workflows/build-iso-stable.yml

@@ -1,24 +1,11 @@
-name: Stable ISO
+name: Anaconda Stable ISO
 on:
-  workflow_call:
   workflow_dispatch:
-    inputs:
-      brand_name:
-        description: "Image Brand to Build"
-        default: '["aurora"]'
-        type: choice
-        options:
-          - '["aurora"]'
 
 jobs:
   build-iso-stable:
     name: Build Stable ISOs
     uses: ./.github/workflows/reusable-build-iso.yml
     secrets: inherit
-    strategy:
-      fail-fast: false
-      matrix:
-        brand_name: ${{ fromJson(inputs.brand_name || '["aurora"]') }}
     with:
-      brand_name: ${{ matrix.brand_name }}
       stream_name: stable

.github/workflows/build-isos.yml

@@ -1,13 +0,0 @@
-name: Build All ISOs
-on:
-    workflow_dispatch:
-
-permissions:
-    contents: read
-    packages: write
-    id-token: write
-
-jobs:
-    build-iso-stable:
-        uses: ./.github/workflows/build-iso-stable.yml
-        secrets: inherit

.github/workflows/reusable-build-iso.yml

@@ -6,10 +6,6 @@ on:
         description: "JSON string of flavors to build, '[main, nvidia]'"
         default: "['main', 'nvidia-open']"
         type: string
-      brand_name:
-        description: "The Brand Name: aurora"
-        required: true
-        type: string
       stream_name:
         description: "The Fedora Version: stable, or latest"
         required: true
@@ -30,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         image_flavor: ${{ fromJson(inputs.image_flavors) }}
-        base_name: ["${{ inputs.brand_name }}"]
+        base_name: ["aurora"]
         stream_name: ["${{ inputs.stream_name }}"]
 
     steps:
@@ -53,7 +49,7 @@ jobs:
         shell: bash
         run: |
           image_name="$(just image_name ${{ matrix.base_name }} ${{ matrix.stream_name }} ${{ matrix.image_flavor }})"
-          just build-iso "${{ matrix.base_name }}" "${{ matrix.stream_name }}" "${{ matrix.image_flavor }}" "1" "1"
+          sudo $(command -v just) build-iso "${{ matrix.base_name }}" "${{ matrix.stream_name }}" "${{ matrix.image_flavor }}" "1" "1"
           echo "IMAGE_NAME=${image_name}" >> $GITHUB_ENV
           echo "ISO_BUILD_DIR=${{ github.workspace }}/${image_name}_build" >> $GITHUB_ENV
           echo "ISO_NAME=${image_name}-${{ matrix.stream_name }}.iso" >> $GITHUB_ENV

Justfile

@@ -1,6 +1,6 @@
 repo_organization := "ublue-os"
-rechunker_image := "ghcr.io/hhd-dev/rechunk:v1.2.2"
-iso_builder_image := "ghcr.io/jasonn3/build-container-installer:v1.3.0"
+rechunker_image := "ghcr.io/hhd-dev/rechunk:v1.2.2@sha256:e799d89f9a9965b5b0e89941a9fc6eaab62e9d2d73a0bfb92e6a495be0706907"
+iso_builder_image := "ghcr.io/jasonn3/build-container-installer:v1.3.0@sha256:c5a44ee1b752fd07309341843f8d9f669d0604492ce11b28b966e36d8297ad29"
 images := '(
     [aurora]=aurora
     [aurora-dx]=aurora-dx
@@ -499,8 +499,7 @@ build-iso $image="aurora" $tag="latest" $flavor="main" ghcr="0" pipeline="0":
     fi
 
     # Fedora Version
-    # FEDORA_VERSION=$(${PODMAN} inspect ${IMAGE_FULL} | jq -r '.[]["Config"]["Labels"]["ostree.linux"]' | grep -oP 'fc\K[0-9]+')
-    FEDORA_VERSION=41
+    FEDORA_VERSION=$(${PODMAN} inspect ${IMAGE_FULL} | jq -r '.[]["Config"]["Labels"]["ostree.linux"]' | grep -oP 'fc\K[0-9]+')
 
     # Load Image into rootful podman
     if [[ "${UID}" -gt 0 && {{ ghcr }} == "0" && ! "${PODMAN}" =~ docker ]]; then