From 2184f805c3501ffd77177197d149a9f44b3522f3 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sun, 17 Mar 2024 13:43:48 -0500 Subject: [PATCH 1/4] feat: enable preview of Fedora 40 main builds --- install.sh | 11 +++++++---- packages.json | 11 +++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index dce5f39e..02532428 100755 --- 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 index cc624b02..57a47768 100644 --- a/packages.json +++ b/packages.json @@ -265,5 +265,16 @@ "default-fonts-cjk-sans" ] } + }, + "40": { + "include": { + "all": [], + "kinoite": [] + }, + "exclude": { + "all": [ + "default-fonts-cjk-sans" + ] + } } } From 8451ef1448b31ab039927ca18e5e6d319856bab0 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Sun, 17 Mar 2024 14:45:37 -0400 Subject: [PATCH 2/4] chore: attempt to enable Fedora 40 builds (#514) --- .github/workflows/build.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d9bb2fb..e52d92f0 100644 --- 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,28 @@ 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 # 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 From 63b92d97a786bfe1fc282740427e747929b4c61f Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sun, 17 Mar 2024 13:46:59 -0500 Subject: [PATCH 3/4] chore: disable F40 mate (no upstream) and tweak source images --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e52d92f0..d69019d3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,6 +55,9 @@ jobs: 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) @@ -70,7 +73,7 @@ jobs: - name: Matrix Variables shell: bash run: | - if [[ "${{ matrix.major_version }}" -ge "40" ]] && \ + if [[ "${{ matrix.major_version }}" -ge "41" ]] && \ grep "${{ matrix.image_name }}" <<< "silverblue, kinoite, sericea"; then echo "SOURCE_ORG=fedora" >> $GITHUB_ENV echo "SOURCE_IMAGE=fedora-${{ matrix.image_name }}" >> $GITHUB_ENV From 77631cacd4b2548439be22d80cc3fb6ffc144400 Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Wed, 20 Mar 2024 13:28:24 -0500 Subject: [PATCH 4/4] chore: since oynx is official should be in this list --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d69019d3..b562c232 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: shell: bash run: | if [[ "${{ matrix.major_version }}" -ge "41" ]] && \ - grep "${{ matrix.image_name }}" <<< "silverblue, kinoite, sericea"; then + 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