diff --git a/.github/workflows/build-38-bluefin.yml b/.github/workflows/build-38-bluefin.yml deleted file mode 100644 index 30a92f8d53a..00000000000 --- a/.github/workflows/build-38-bluefin.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: bluefin 38 -on: - merge_group: - pull_request: - branches: - - main - - testing - paths-ignore: - - '**.md' - - 'system_files/kinoite/**' - schedule: - - cron: '42 16 * * *' # 16:42 UTC everyday - workflow_dispatch: - -jobs: - build: - name: build - uses: ./.github/workflows/reusable-build.yml - secrets: inherit - with: - brand_name: bluefin - fedora_version: 38 - - scan: - # Scan can still be ran when some builds fail since only successfully built - # images will be stored in the output - if: (github.event_name != 'pull_request' && github.event_name != 'merge_group') && always() - uses: ./.github/workflows/reusable-image-scan.yml - needs: build - secrets: inherit - with: - images: ${{ needs.build.outputs.images }} diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index ba23495c5a0..fa23fa41363 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -110,11 +110,7 @@ jobs: TIMESTAMP="$(date +%Y%m%d)" FEDORA_VERSION="${{ 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/build_files/base/aurora-changes.sh b/build_files/base/aurora-changes.sh index 16ff5177639..3c4d4ee4b57 100644 --- a/build_files/base/aurora-changes.sh +++ b/build_files/base/aurora-changes.sh @@ -17,7 +17,4 @@ if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then rm -f /usr/etc/profile.d/gnome-ssh-askpass.{csh,sh} # This shouldn't be pulled in rm -f /usr/share/kglobalaccel/org.kde.konsole.desktop systemctl enable kde-sysmonitor-workaround.service - if [[ "$FEDORA_MAJOR_VERSION " -eq "38" ]]; then - rm -f /usr/etc/profile.d/aurora-fastfetch.sh - fi fi diff --git a/build_files/base/bluefin-changes.sh b/build_files/base/bluefin-changes.sh index ec12502df04..27638e2649a 100644 --- a/build_files/base/bluefin-changes.sh +++ b/build_files/base/bluefin-changes.sh @@ -9,9 +9,5 @@ if [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then if [[ -f /usr/share/applications/org.gnome.SystemMonitor.desktop ]]; then sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/org.gnome.SystemMonitor.desktop fi - if [[ "$FEDORA_MAJOR_VERSION " -eq "38" ]]; then - rm -f /usr/etc/profile.d/bluefin-fashfetch.sh - else - sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.gnome.Terminal.desktop - fi + sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.gnome.Terminal.desktop fi \ No newline at end of file diff --git a/packages.json b/packages.json index ea7a4cb307b..cb1bbca0a53 100644 --- a/packages.json +++ b/packages.json @@ -137,24 +137,6 @@ "dx": [] } }, - "38": { - "include": { - "silverblue": [ - "gnome-shell-extension-tailscale-status" - ], - "dx": [ - "distrobuilder", - "devpod", - "podman-plugins" - ] - }, - "exclude": { - "silverblue": [ - "podman-docker" - ], - "dx": [] - } - }, "39": { "include": { "all": [