From 3e13abeb3d5a12d3becac861358512c62a5cee01 Mon Sep 17 00:00:00 2001 From: lea Date: Sun, 12 May 2024 02:39:01 -0700 Subject: [PATCH] more 40 --- .github/workflows/ostree.yml | 2 +- common/hardware.yaml | 2 +- isos/justfile | 2 +- tau/home.yaml | 4 ++-- ultramarine/base.yaml | 6 +++--- ultramarine/flagship.yaml | 6 +++--- ultramarine/gnome.yaml | 6 +++--- ultramarine/kde.yaml | 6 +++--- ultramarine/pantheon.yaml | 6 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ostree.yml b/.github/workflows/ostree.yml index f49f937..8757654 100644 --- a/.github/workflows/ostree.yml +++ b/.github/workflows/ostree.yml @@ -73,7 +73,7 @@ jobs: run: echo "VARIANT_SAFE_NAME=$(echo "${{inputs.variant}}" | tr / -)" >> $GITHUB_ENV - name: Get image tag - run: echo "IMAGE_TAG=${{ startsWith(inputs.variant, 'ultramarine') && '39' || '1' }}" >> $GITHUB_ENV + run: echo "IMAGE_TAG=${{ startsWith(inputs.variant, 'ultramarine') && '40' || '1' }}" >> $GITHUB_ENV - name: Install dependencies run: sudo apt-get update && sudo apt-get install -y buildah diff --git a/common/hardware.yaml b/common/hardware.yaml index 8d0870c..faf35ea 100644 --- a/common/hardware.yaml +++ b/common/hardware.yaml @@ -8,7 +8,7 @@ groups: - intel-media-driver - libva-intel-driver - broadcom-wl - # TODO: multican isn't even in Fedora 39, yet is in the Fedora comps.xml for 39 + # TODO: multican isn't even in Fedora 40, yet is in the Fedora comps.xml for 40 # We should notify upstream - multican - id: server-hardware-support diff --git a/isos/justfile b/isos/justfile index adf97fa..1a0adb2 100644 --- a/isos/justfile +++ b/isos/justfile @@ -1,4 +1,4 @@ -fedora_version := "39" +fedora_version := "40" ultramarine_version := fedora_version tau_version := "1" diff --git a/tau/home.yaml b/tau/home.yaml index 03e53ec..bd05bb6 100644 --- a/tau/home.yaml +++ b/tau/home.yaml @@ -1,5 +1,5 @@ ref: tau/1/home/${basearch} -releasever: "39" +releasever: "40" include: - ../common/desktop.yaml @@ -18,7 +18,7 @@ repos: - rpmfusion-nonfree-updates - fedora - fedora-updates - # - fedora-updates-testing # TODO: Remove once Fedora 39 hits stable + # - fedora-updates-testing # TODO: Remove once Fedora 40 hits stable - openh264 packages: diff --git a/ultramarine/base.yaml b/ultramarine/base.yaml index 1935222..53adf58 100644 --- a/ultramarine/base.yaml +++ b/ultramarine/base.yaml @@ -1,5 +1,5 @@ -ref: ultramarine/39/base/${basearch} -releasever: "39" +ref: ultramarine/40/base/${basearch} +releasever: "40" include: - ../common/common.yaml @@ -16,7 +16,7 @@ repos: - rpmfusion-nonfree-updates - fedora - fedora-updates - # - fedora-updates-testing # TODO: Remove once Fedora 39 hits stable + # - fedora-updates-testing # TODO: Remove once Fedora 40 hits stable - openh264 packages: diff --git a/ultramarine/flagship.yaml b/ultramarine/flagship.yaml index 5efac03..cb6c213 100644 --- a/ultramarine/flagship.yaml +++ b/ultramarine/flagship.yaml @@ -1,5 +1,5 @@ -ref: ultramarine/39/flagship/${basearch} -releasever: "39" +ref: ultramarine/40/flagship/${basearch} +releasever: "40" include: - ../common/desktop.yaml @@ -19,7 +19,7 @@ repos: - rpmfusion-nonfree-updates - fedora - fedora-updates - # - fedora-updates-testing # TODO: Remove once Fedora 39 hits stable + # - fedora-updates-testing # TODO: Remove once Fedora 40 hits stable - openh264 groups: diff --git a/ultramarine/gnome.yaml b/ultramarine/gnome.yaml index 06c94bd..0f96275 100644 --- a/ultramarine/gnome.yaml +++ b/ultramarine/gnome.yaml @@ -1,5 +1,5 @@ -ref: ultramarine/39/gnome/${basearch} -releasever: "39" +ref: ultramarine/40/gnome/${basearch} +releasever: "40" include: - ../common/desktop.yaml @@ -19,7 +19,7 @@ repos: - rpmfusion-nonfree-updates - fedora - fedora-updates - # - fedora-updates-testing # TODO: Remove once Fedora 39 hits stable + # - fedora-updates-testing # TODO: Remove once Fedora 40 hits stable - openh264 groups: diff --git a/ultramarine/kde.yaml b/ultramarine/kde.yaml index eeb62e9..73c2264 100644 --- a/ultramarine/kde.yaml +++ b/ultramarine/kde.yaml @@ -1,5 +1,5 @@ -ref: ultramarine/39/kde/${basearch} -releasever: "39" +ref: ultramarine/40/kde/${basearch} +releasever: "40" include: - ../common/desktop.yaml @@ -19,7 +19,7 @@ repos: - rpmfusion-nonfree-updates - fedora - fedora-updates - # - fedora-updates-testing # TODO: Remove once Fedora 39 hits stable + # - fedora-updates-testing # TODO: Remove once Fedora 40 hits stable - openh264 groups: diff --git a/ultramarine/pantheon.yaml b/ultramarine/pantheon.yaml index 2f7b8c1..62ba950 100644 --- a/ultramarine/pantheon.yaml +++ b/ultramarine/pantheon.yaml @@ -1,5 +1,5 @@ -ref: ultramarine/39/pantheon/${basearch} -releasever: "39" +ref: ultramarine/40/pantheon/${basearch} +releasever: "40" include: - ../common/desktop.yaml @@ -19,7 +19,7 @@ repos: - rpmfusion-nonfree-updates - fedora - fedora-updates - # - fedora-updates-testing # TODO: Remove once Fedora 39 hits stable + # - fedora-updates-testing # TODO: Remove once Fedora 40 hits stable - openh264 groups: