feat: enable preview of Fedora 40 main builds (#521)

Co-authored-by: Dylan M. Taylor <[email protected]> Co-authored-by: Jorge O. Castro <[email protected]>
ublue-os · Mar 23, 2024 · 72e1f64 · 72e1f64
1 parent a52bdef
commit 72e1f64
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,7 +29,7 @@ jobs:
           - lazurite
           - mate
           - vauxite
-        major_version: [38, 39]
+        major_version: [38, 39, 40]
         build_target: [nokmods, kmods]
         include:
           - major_version: 38
@@ -40,20 +40,31 @@ jobs:
             is_latest_version: true
             is_stable_version: true
             is_gts_version: false
+          - major_version: 40
+            is_latest_version: false
+            is_stable_version: false
+            is_gts_version: false
         exclude:
           # There is no Fedora 38 version of onyx or lazurite
           - image_name: onyx
             major_version: 38
           - image_name: lazurite
             major_version: 38
-          # There is no Fedora 39 version of lxqt as it was replaced by lazurite
+          # There is no Fedora 39+ version of lxqt as it was replaced by lazurite
           - image_name: lxqt
             major_version: 39
+          - image_name: lxqt
+            major_version: 40
+          # There is currently no Fedora 40 version of mate
+          - image_name: mate
+            major_version: 40
           # THE FOLLOWING EXCLUDE IS MESSY BUT TEMPORARY UNTIL F38 IS GONE
           # see: https://github.com/ublue-os/main/issues/369
           # Fedora 39+ images do not include custom kmods (legacy)
           - build_target: kmods
             major_version: 39
+          - build_target: kmods
+            major_version: 40
     steps:
       # Checkout push-to-registry action GitHub repository
       - name: Checkout Push to Registry action
@@ -62,8 +73,8 @@ jobs:
       - name: Matrix Variables
         shell: bash
         run: |
-          if [[ "${{ matrix.major_version }}" -ge "40" ]] && \
-            grep "${{ matrix.image_name }}" <<< "silverblue, kinoite, sericea"; then
+          if [[ "${{ matrix.major_version }}" -ge "41" ]] && \
+            grep "${{ matrix.image_name }}" <<< "silverblue, kinoite, sericea, onyx"; then
               echo "SOURCE_ORG=fedora" >> $GITHUB_ENV
               echo "SOURCE_IMAGE=fedora-${{ matrix.image_name }}" >> $GITHUB_ENV
           else

diff --git a/install.sh b/install.sh
@@ -23,15 +23,18 @@ if [[ "${FEDORA_MAJOR_VERSION}" -ge 39 ]]; then
     sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=110/}' /etc/yum.repos.d/rpmfusion-*-updates-testing.repo
 fi
 
+# after F40 launches, bump to 41
+if [[ "${FEDORA_MAJOR_VERSION}" -ge 40 ]]; then
+    # note: this is done before single mirror hack to ensure this persists in image and is not reset
+    # pre-release rpmfusion is in a different location
+    sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo
+fi
+
 if [ -n "${RPMFUSION_MIRROR}" ]; then
     # force use of single rpmfusion mirror
     echo "Using single rpmfusion mirror: ${RPMFUSION_MIRROR}"
     sed -i.bak "s%^metalink=%#metalink=%" /etc/yum.repos.d/rpmfusion-*.repo
     sed -i "s%^#baseurl=http://download1.rpmfusion.org%baseurl=${RPMFUSION_MIRROR}%" /etc/yum.repos.d/rpmfusion-*.repo
-    # after F40 launches, bump to 41
-    if [[ "${FEDORA_MAJOR_VERSION}" -ge 40 ]]; then
-        sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo
-    fi
 fi
 
 # run common packages script

diff --git a/packages.json b/packages.json
@@ -265,5 +265,16 @@
                 "default-fonts-cjk-sans"
             ]
         }
+    },
+    "40": {
+        "include": {
+            "all": [],
+            "kinoite": []
+        },
+        "exclude": {
+            "all": [
+                "default-fonts-cjk-sans"
+            ]
+        }
     }
 }