feat: GTS use coreos matched kernel (#1456)

ublue-os · Jul 1, 2024 · 080802f · 080802f
1 parent 24ddce9
commit 080802f
Show file tree

Hide file tree

Showing 28 changed files with 292 additions and 196 deletions.
diff --git a/.github/workflows/build-39-aurora.yml b/.github/workflows/build-39-aurora.yml
diff --git a/.github/workflows/build-aurora-iso.yml → ...hub/workflows/build-aurora-latest-iso.yml b/.github/workflows/build-aurora-iso.yml → ...hub/workflows/build-aurora-latest-iso.yml
@@ -1,13 +1,13 @@
-name: Aurora ISO
+name: Aurora Latest ISO
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 2 * * sun'  # 02:00 Sunday
+    - cron: '0 4 * * sun'  # 04:00 Sunday
 jobs:
   build-40:
-    name: Aurora 40
+    name: Aurora Latest ISO
     uses: ./.github/workflows/reusable-build-iso.yml
     secrets: inherit
     with:
       brand_name: aurora
-      fedora_version: 40
+      fedora_version: latest
diff --git a/.github/workflows/build-aurora-stable-iso.yml b/.github/workflows/build-aurora-stable-iso.yml
@@ -0,0 +1,12 @@
+name: Aurora Stable ISO
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Aurora Stable
+    uses: ./.github/workflows/reusable-build-iso.yml
+    secrets: inherit
+    with:
+      brand_name: aurora
+      fedora_version: stable
diff --git a/.github/workflows/build-beta-aurora.yml b/.github/workflows/build-beta-aurora.yml
@@ -0,0 +1,28 @@
+name: Aurora Beta
+on:
+  # merge_group:
+  # pull_request:
+  #   branches:
+  #     - main
+  #     - testing
+  #   paths-ignore:
+  #     - "**.md"
+  #     - "system_files/silverblue/**"
+  # push:
+  #   branches:
+  #     - main
+  #   paths-ignore:
+  #     - "**.md"
+  #     - "system_files/silverblue/**"
+  # schedule:
+  #   - cron: "40 4 * * *" # 4:40 UTC everyday
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: build
+    uses: ./.github/workflows/reusable-build.yml
+    secrets: inherit
+    with:
+      brand_name: aurora
+      fedora_version: beta
diff --git a/.github/workflows/build-beta-bluefin.yml b/.github/workflows/build-beta-bluefin.yml
@@ -0,0 +1,28 @@
+name: Bluefin Beta
+on:
+  # merge_group:
+  # pull_request:
+  #   branches:
+  #     - main
+  #     - testing
+  #   paths-ignore:
+  #     - "**.md"
+  #     - "system_files/silverblue/**"
+  # push:
+  #   branches:
+  #     - main
+  #   paths-ignore:
+  #     - "**.md"
+  #     - "system_files/silverblue/**"
+  # schedule:
+  #   - cron: "40 4 * * *" # 4:40 UTC everyday
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: build
+    uses: ./.github/workflows/reusable-build.yml
+    secrets: inherit
+    with:
+      brand_name: bluefin
+      fedora_version: beta
diff --git a/.github/workflows/build-bluefin-gts-iso.yml b/.github/workflows/build-bluefin-gts-iso.yml
@@ -1,9 +1,8 @@
 name: Bluefin GTS ISO
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '0 2 * * sun'  # 02:00 Sunday
-
+  # schedule:
+  #   - cron: '0 2 * * sun'  # 02:00 Sunday
 
 jobs:
   build-gts:
@@ -12,4 +11,4 @@ jobs:
     secrets: inherit
     with:
       brand_name: bluefin
-      fedora_version: 39
+      fedora_version: gts
diff --git a/.github/workflows/build-bluefin-latest-iso.yml b/.github/workflows/build-bluefin-latest-iso.yml
@@ -2,7 +2,7 @@ name: Bluefin Latest ISO
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 3 * * sun'  # 03:00 Sunday
+    - cron: '0 4 * * sun'  # 04:00 Sunday
 
 
 jobs:

diff --git a/.github/workflows/build-bluefin-stable-iso.yml b/.github/workflows/build-bluefin-stable-iso.yml
@@ -1,8 +1,8 @@
-name: Bluefin Stable ISO Build
+name: Bluefin Stable ISO
 on:
   workflow_dispatch:
-  schedule:
-    - cron: '41 6 * * 2'  # 6:41 UTC every Tuesday
+  # schedule:
+  #   - cron: '41 6 * * 2'  # 6:41 UTC every Tuesday
 
 
 jobs:

diff --git a/.github/workflows/build-39-bluefin.yml → .github/workflows/build-gts-bluefin.yml b/.github/workflows/build-39-bluefin.yml → .github/workflows/build-gts-bluefin.yml
@@ -1,4 +1,4 @@
-name: Bluefin 39
+name: Bluefin GTS
 on:
   pull_request:
     branches:
@@ -18,4 +18,4 @@ jobs:
     secrets: inherit
     with:
       brand_name: bluefin
-      fedora_version: 39
+      fedora_version: gts
diff --git a/.github/workflows/build-40-aurora.yml → .github/workflows/build-latest-aurora.yml b/.github/workflows/build-40-aurora.yml → .github/workflows/build-latest-aurora.yml
@@ -1,4 +1,4 @@
-name: Aurora 40
+name: Aurora Latest
 on:
   merge_group:
   pull_request:
@@ -25,4 +25,4 @@ jobs:
     secrets: inherit
     with:
       brand_name: aurora
-      fedora_version: 40
+      fedora_version: latest
diff --git a/.github/workflows/build-40-bluefin.yml → .github/workflows/build-latest-bluefin.yml b/.github/workflows/build-40-bluefin.yml → .github/workflows/build-latest-bluefin.yml
@@ -1,4 +1,4 @@
-name: Bluefin 40
+name: Bluefin Latest
 on:
   merge_group:
   pull_request:
@@ -25,4 +25,4 @@ jobs:
     secrets: inherit
     with:
       brand_name: bluefin
-      fedora_version: 40
+      fedora_version: latest
diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml
@@ -1,4 +1,4 @@
-name: Reusable ISO 
+name: Reusable ISO
 on:
   workflow_call:
     inputs:
@@ -7,7 +7,7 @@ on:
         required: true
         type: string
       fedora_version:
-        description: 'The Fedora release version: 38, 39, 40, etc'
+        description: "The Fedora release version: 38, 39, 40, etc"
         required: true
         type: string
 
@@ -38,13 +38,17 @@ jobs:
         fedora_version:
           - ${{ inputs.fedora_version }}
         exclude:
-          - fedora_version: 38
+          - fedora_version: gts
             image_flavor: asus
-          - fedora_version: 38
+          - fedora_version: gts
             image_flavor: asus-nvidia
-          - fedora_version: 38
+          - fedora_version: stable
+            image_flavor: asus
+          - fedora_version: stable
+            image_flavor: asus-nvidia
+          - fedora_version: stable
             image_flavor: surface
-          - fedora_version: 38
+          - fedora_version: stable
             image_flavor: surface-nvidia
 
     steps:
@@ -66,26 +70,29 @@ jobs:
           elif [[ ${{ inputs.brand_name }} == "aurora" ]]; then
             echo "VARIANT=Kinoite" >> $GITHUB_ENV
           fi
-          if [[ ${{ inputs.fedora_version }} == "39" ]]; then
-            echo "IS_GTS_VERSION=true" >> $GITHUB_ENV
-          elif [[ ${{ inputs.fedora_version }} == "40" ]]; then
-            echo "IS_LATEST_VERSION=true" >> $GITHUB_ENV
-          fi
+
+      - name: Get Current Fedora Version
+        id: labels
+        shell: bash
+        run: |
+          set -eo pipefail
+          kernel_release=$(skopeo inspect docker://ghcr.io/ublue-os/${{ env.IMAGE_NAME }}:${{ inputs.fedora_version }} | jq -r '.Labels["ostree.linux"] | split(".x86_64")[0]')
+          fedora_version=$(echo $kernel_release | grep -oP 'fc\K[0-9]+')
+          echo "kernel_release=$kernel_release" >> $GITHUB_OUTPUT
+          echo "fedora_version=$fedora_version" >> $GITHUB_OUTPUT
 
       - name: Set Image Tag
         id: generate-tag
         shell: bash
         run: |
-          if [[ "${{ env.IS_LATEST_VERSION }}" == "true" ]]; then
-            TAG="latest"
-          elif [[ "${{ env.IS_GTS_VERSION }}" == "true" ]]; then
-            TAG="gts"
-          fi
+          TAG="${{ inputs.fedora_version }}"
 
           if [[ "${{ github.ref_name }}" == "testing" ]]; then
-            if [[ "${{ env.IS_GTS_VERSION }}" == "true" ]]; then
+            if [[ "${{ inputs.fedora_version }}" == "true" ]]; then
               TAG="gts-testing"
-            elif [[ "${{ env.IS_LATEST_VERSION }}" == "true" ]]; then
+            elif [[ "${{ inputs.fedora_version }}" == "true" ]]; then
+              TAG="stable-testing"
+            elif [[ "${{ inputs.fedora_version }}" == "true" ]]; then
               TAG="testing"
             fi
           fi
@@ -113,7 +120,7 @@ jobs:
         shell: bash
         run: |
           set -ex
-          image="ghcr.io/ublue-os/${{ env.IMAGE_NAME }}:${{ steps.generate-tag.outputs.tag }}"
+          image="ghcr.io/ublue-os/${{ env.IMAGE_NAME }}:${{ inputs.fedora_version }}"
           # Make temp space
           TEMP_FLATPAK_INSTALL_DIR=$(mktemp -d -p ${{ github.workspace }} flatpak.XXX)
           # Get list of refs from directory
@@ -147,10 +154,10 @@ jobs:
           image_name: ${{ env.IMAGE_NAME }}
           image_repo: ghcr.io/ublue-os
           variant: ${{ env.VARIANT }}
-          version: ${{ matrix.fedora_version }}
+          version: ${{ steps.labels.outputs.fedora_version }}
           image_tag: ${{ steps.generate-tag.outputs.tag }}
-          secure_boot_key_url: 'https://github.com/ublue-os/akmods/raw/main/certs/public_key.der'
-          enrollment_password: 'ublue-os'
+          secure_boot_key_url: "https://github.com/ublue-os/akmods/raw/main/certs/public_key.der"
+          enrollment_password: "ublue-os"
           iso_name: ${{ env.IMAGE_NAME }}-${{ steps.generate-tag.outputs.tag }}.iso
           enable_cache_dnf: "false"
           enable_cache_skopeo: "false"