From d81d60e2c4431b7bde9541abe2d28a507fb6e98e Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Sat, 27 Apr 2024 07:45:54 -0500 Subject: [PATCH] chore: remove Fedora 38 (#245) Relates: ublue-os/main#527 --- .github/workflows/build-38.yml | 15 --------------- .github/workflows/reusable-build.yml | 24 ++---------------------- README.md | 2 +- nvidia-install.sh | 6 +----- 4 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 .github/workflows/build-38.yml diff --git a/.github/workflows/build-38.yml b/.github/workflows/build-38.yml deleted file mode 100644 index eb71ab98..00000000 --- a/.github/workflows/build-38.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: ublue hwe 38 -on: - pull_request: - merge_group: - schedule: - - cron: '40 15 * * *' # 15:30-ish UTC everyday (30 min delay after 'main' builds) - workflow_dispatch: - -jobs: - build: - name: build - uses: ./.github/workflows/reusable-build.yml - secrets: inherit - with: - fedora_version: 38 \ No newline at end of file diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 960bf173..cd120b35 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -3,7 +3,7 @@ on: workflow_call: inputs: fedora_version: - description: 'The Fedora release version: 38, 39, 40, etc' + description: 'The Fedora release version: 39, 40, etc' required: true type: string env: @@ -36,7 +36,6 @@ jobs: - sericea - onyx - base - - lxqt - lazurite - mate - vauxite @@ -44,27 +43,12 @@ jobs: - main - nvidia exclude: - # There is no Fedora 38 version of onyx or lazurite - - image_name: onyx - fedora_version: 38 - - image_name: lazurite - fedora_version: 38 - # There is no Fedora 39+ version of lxqt as it was replaced by lazurite - - image_name: lxqt - fedora_version: 39 - - image_name: lxqt - fedora_version: 40 # There is currently no Fedora 40 version of mate - image_name: mate fedora_version: 40 # Don't build/push "main" since it would be a duplicate of the "base" `*-main` images - kernel_flavor: main image_target: main - # Only build latest Fedora versions for "asus" and "surface" HWE flavors - - fedora_version: 38 - kernel_flavor: asus - - fedora_version: 38 - kernel_flavor: surface steps: # Checkout push-to-registry action GitHub repository - name: Checkout Push to Registry action @@ -96,11 +80,7 @@ jobs: TIMESTAMP="$(date +%Y%m%d)" VARIANT="${{ matrix.fedora_version }}" - if [[ "${{ matrix.fedora_version }}" -eq "38" ]]; then - IS_LATEST_VERSION=false - IS_STABLE_VERSION=true - IS_GTS_VERSION=false - elif [[ "${{ matrix.fedora_version }}" -eq "39" ]]; then + if [[ "${{ matrix.fedora_version }}" -eq "39" ]]; then IS_LATEST_VERSION=false IS_STABLE_VERSION=true IS_GTS_VERSION=true diff --git a/README.md b/README.md index e56238b5..7f46e2e8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # HWE -[![build-38](https://github.com/ublue-os/hwe/actions/workflows/build-38.yml/badge.svg)](https://github.com/ublue-os/hwe/actions/workflows/build-38.yml) [![build-39](https://github.com/ublue-os/hwe/actions/workflows/build-39.yml/badge.svg)](https://github.com/ublue-os/hwe/actions/workflows/build-39.yml) [![build-40](https://github.com/ublue-os/hwe/actions/workflows/build-40.yml/badge.svg)](https://github.com/ublue-os/hwe/actions/workflows/build-40.yml) +[![build-39](https://github.com/ublue-os/hwe/actions/workflows/build-39.yml/badge.svg)](https://github.com/ublue-os/hwe/actions/workflows/build-39.yml) [![build-40](https://github.com/ublue-os/hwe/actions/workflows/build-40.yml/badge.svg)](https://github.com/ublue-os/hwe/actions/workflows/build-40.yml) The purpose of these images is to provide [community Fedora images](https://github.com/ublue-os/main) with hardware enablement (ASUS and Surface) and Nvidia. This approach can lead to greater reliability as failures can be caught at the build level instead of the client machine. This also allows for individual sets of images for each series of Nvidia drivers, allowing users to remain current with their OS but on an older, known working driver. Performance regression with a recent driver update? Reboot into a known-working driver after one command. That's the goal! diff --git a/nvidia-install.sh b/nvidia-install.sh index 04e5a8f4..089615d5 100755 --- a/nvidia-install.sh +++ b/nvidia-install.sh @@ -4,11 +4,7 @@ set -ouex pipefail RELEASE="$(rpm -E %fedora)" -if [[ "${FEDORA_MAJOR_VERSION}" -le 38 ]]; then - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo -else - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo -fi +sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo # after F41 launches, bump to 42 if [[ "${FEDORA_MAJOR_VERSION}" -ge 41 ]]; then