From 2882900055a12cf57ff98e6c5d25485082069c75 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
Date: Mon, 8 Dec 2025 16:11:43 -0500
Subject: [PATCH] drop fedora-bootc submodule

We're now completely moved over to building via container [1], which
means that we are no longer using the git submodule for manifest
definitions for bootc but rather the manifests delivered with the
build container. Thus we are always "deriving: true" and we can delete
any config that was for the "deriving: false" condition.

[1] https://github.com/coreos/fedora-coreos-tracker/issues/1969
---
 .github/workflows/bump-fedora-bootc.yaml | 67 ------------------------
 .gitmodules                              |  3 --
 fedora-bootc                             |  1 -
 manifests/coreos-bootc-minimal-plus.yaml | 14 +----
 manifests/fedora-coreos.yaml             |  5 --
 5 files changed, 1 insertion(+), 89 deletions(-)
 delete mode 100644 .github/workflows/bump-fedora-bootc.yaml
 delete mode 160000 fedora-bootc

diff --git a/.github/workflows/bump-fedora-bootc.yaml b/.github/workflows/bump-fedora-bootc.yaml
deleted file mode 100644
index 93e4b12d..00000000
--- a/.github/workflows/bump-fedora-bootc.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-name: Bump fedora-bootc submodule
-
-on:
-  schedule:
-    - cron: '0 */6 * * *'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  bump-fedora-bootc-submodule:
-    name: Bump fedora-bootc submodule
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          submodules: true
-          fetch-depth: 0
-      # https://github.com/actions/checkout/issues/766
-      - name: Mark git checkout as safe
-        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
-      - name: Check if there are new commits
-        run: |
-          diffset="bootc-base-imagectl minimal-plus.hidden.yaml fedora-includes/generic.yaml minimal/ minimal-plus/"
-          previous_rev=$(git -C fedora-bootc rev-parse HEAD)
-          git submodule update --remote fedora-bootc
-          new_rev=$(git -C fedora-bootc rev-parse HEAD)
-          if [ "${previous_rev}" != "${new_rev}" ]; then
-              if git -C fedora-bootc diff --quiet "${previous_rev}" "${new_rev}" ${diffset}; then
-                  # reset back any changes to avoid a PR bump
-                  git submodule update
-              fi
-          fi
-          if git diff --quiet --exit-code; then
-              echo "No bootc base images changes; exiting"
-              exit 0
-          fi
-
-          git -C fedora-bootc shortlog --no-merges "${previous_rev}..${new_rev}" -- ${diffset} > $RUNNER_TEMP/shortlog
-
-          marker=END-OF-LOG-MARKER-$RANDOM$RANDOM$RANDOM
-          cat >> $GITHUB_ENV <<EOF
-          SHORTLOG<<$marker
-          $(cat $RUNNER_TEMP/shortlog)
-          $marker
-          EOF
-      - name: Open pull request
-        uses: peter-evans/create-pull-request@v6
-        with:
-          token: ${{ secrets.COREOSBOT_RELENG_TOKEN }}
-          push-to-fork: coreosbot-releng/fedora-coreos-config
-          branch: bump-fedora-bootc
-          commit-message: |
-            Bump fedora-bootc submodule
-
-            ${{ env.SHORTLOG }}
-          title: "Bump fedora-bootc submodule"
-          body: |
-            Created by [GitHub workflow](${{ github.server_url }}/${{ github.repository }}/actions/workflows/bump-fedora-bootc.yml) ([source](${{ github.server_url }}/${{ github.repository }}/blob/testing-devel/.github/workflows/bump-fedora-bootc.yml)).
-
-            ```
-            ${{ env.SHORTLOG }}
-            ```
-          committer: "CoreOS Bot <coreosbot@fedoraproject.org>"
-          author: "CoreOS Bot <coreosbot@fedoraproject.org>"
diff --git a/.gitmodules b/.gitmodules
index 9b68420b..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "fedora-bootc"]
-	path = fedora-bootc
-	url = https://gitlab.com/fedora/bootc/base-images.git
diff --git a/fedora-bootc b/fedora-bootc
deleted file mode 160000
index 52f99414..00000000
--- a/fedora-bootc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 52f994146d33cfc6d6f88a7f561fd102b73db1a9
diff --git a/manifests/coreos-bootc-minimal-plus.yaml b/manifests/coreos-bootc-minimal-plus.yaml
index c5b0392d..473d92e4 100644
--- a/manifests/coreos-bootc-minimal-plus.yaml
+++ b/manifests/coreos-bootc-minimal-plus.yaml
@@ -1,16 +1,4 @@
-# Here, we include bootc minimal-plus, but override some key settings.
-
-# If we are fedora there are a few more settings in
-# fedora-includes/generic.yaml that fedora-minimal-plus.yaml
-# pulls in. We need to monitor fedora-minimal-plus.yaml to
-# make sure we update our strategy here if that file changes.
-conditional-include:
-  - if: deriving == false
-    include: ../fedora-bootc/minimal-plus/manifest.yaml
-  - if:
-    - id == "fedora"
-    - deriving == false
-    include: ../fedora-bootc/fedora-includes/generic.yaml
+# Here we override some key settings from bootc minimal-plus.
 
 # Required by Ignition, and makes the system not compatible with Anaconda.
 # Note this deviates from fedora-bootc and means `systemctl enable` doesn't
diff --git a/manifests/fedora-coreos.yaml b/manifests/fedora-coreos.yaml
index 7e659dd2..14f1257b 100644
--- a/manifests/fedora-coreos.yaml
+++ b/manifests/fedora-coreos.yaml
@@ -11,11 +11,6 @@ metadata:
 add-commit-metadata:
   fedora-coreos.stream: ${stream}
 
-variables:
-  # upper manifests can override this when deriving from minimal-plus instead of
-  # doing a base compose
-  deriving: false
-
 include: fedora-coreos-base.yaml
 conditional-include:
   - if: releasever >= 41