From 6ff9046a2dace421407cb0d1c2aa795ac8c8fd99 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Mon, 23 Sep 2024 12:22:22 -0400
Subject: [PATCH] wip

---
 .github/workflows/bump-fedora-bootc.yaml | 13 ++++++++-----
 fedora-bootc                             |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/bump-fedora-bootc.yaml b/.github/workflows/bump-fedora-bootc.yaml
index b47246bd2..2accce7ac 100644
--- a/.github/workflows/bump-fedora-bootc.yaml
+++ b/.github/workflows/bump-fedora-bootc.yaml
@@ -12,21 +12,22 @@ jobs:
   bump-fedora-bootc-submodule:
     name: Bump fedora-bootc submodule
     runs-on: ubuntu-latest
-    container:
-      image: quay.io/coreos-assembler/coreos-assembler:latest
-      options: "--user root --privileged"
     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: |
+          set -x
           previous_rev=$(git -C fedora-bootc rev-parse HEAD)
           git submodule update --remote fedora-bootc
+          # the submodule init only fetch the submodule commit
+          # git -C fedora-bootc fetch origin master
           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}" tier-0 tier-x; then
@@ -39,7 +40,9 @@ jobs:
               exit 0
           fi
 
-          git -C fedora-bootc shortlog --no-merges "${previous_rev}..${new_rev}" > $RUNNER_TEMP/shortlog
+          git status
+          git -C fedora-bootc shortlog "${previous_rev}..${new_rev}" -- tier-0 tier-x
+          git -C fedora-bootc shortlog "${previous_rev}..${new_rev}" -- tier-0 tier-x > $RUNNER_TEMP/shortlog
 
           marker=END-OF-LOG-MARKER-$RANDOM$RANDOM$RANDOM
           cat >> $GITHUB_ENV <<EOF
@@ -51,7 +54,7 @@ jobs:
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.COREOSBOT_RELENG_TOKEN }}
-          push-to-fork: coreosbot-releng/fedora-coreos-config
+          push-to-fork: jlebon/fedora-coreos-config
           branch: bump-fedora-bootc
           commit-message: |
             Bump fedora-bootc submodule
diff --git a/fedora-bootc b/fedora-bootc
index 92172d2d5..243b2c03b 160000
--- a/fedora-bootc
+++ b/fedora-bootc
@@ -1 +1 @@
-Subproject commit 92172d2d56798748898cdc9126a2c7bac13a845b
+Subproject commit 243b2c03bc05e4fc004ead768af6c72c12ed13d6