chore: accept new Cruft update

Author: Kidswiss

.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/vshn/appcat-cookiecutter",
-  "commit": "5309ae05edb3c118e23e64e8ec0bed2b6768ac86",
+  "commit": "9e29b2c7a3cf60e3817dff61b8f39bbc811c64e7",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -13,7 +13,8 @@
         ".github/workflows/cruft-update.yml",
         ".github/changelog-configuration.json"
       ],
-      "_template": "https://github.com/vshn/appcat-cookiecutter"
+      "_template": "https://github.com/vshn/appcat-cookiecutter",
+      "_commit": "9e29b2c7a3cf60e3817dff61b8f39bbc811c64e7"
     }
   },
   "directory": null

.github/changelog-configuration.json

@@ -32,5 +32,8 @@
       ]
     }
   ],
-  "template": "${{CATEGORIZED_COUNT}} changes since ${{FROM_TAG}}\n\n${{CHANGELOG}}"
+  "template": "${{CATEGORIZED_COUNT}} changes since ${{FROM_TAG}}\n\n${{CHANGELOG}}",
+  "ignore_labels": [
+    "ignoreChangelog"
+  ]
 }

.github/workflows/pr.yml

@@ -16,12 +16,31 @@ env:
   PUSH_IMAGE: "True"
 
 jobs:
+  check-allow-merge:
+    runs-on: ubuntu-latest
+    steps:
+      # Labels in the context don't get updated so they are stuck at what's set during creation
+      # We need this action to get current labels
+      - name: Get current labels
+        uses: snnaplab/get-labels-action@v1
+      - name: Check if merge is allowed
+        if: github.base_ref == 'master' && github.head_ref != 'develop'
+        run: |
+          ${{ contains(fromJSON(env.LABELS), 'hotfix') }} && exit 0
+          echo "ERROR: You can only merge to master from develop or hotfixes."
+          exit 1
   check-labels:
     # Act doesn't set a pull request number by default, so we skip if it's 0
     if: github.event.pull_request.number != 0
     name: Check labels
     runs-on: ubuntu-latest
     steps:
+      - name: Ignore from Changelog if merge to master
+        uses: actions-ecosystem/action-add-labels@v1
+        if: github.base_ref == 'master'
+        with:
+          labels: ignoreChangelog
+
       - uses: docker://agilepathway/pull-request-label-checker:v1.6.51
         with:
           one_of: major,minor,patch,documentation,dependency
@@ -31,6 +50,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
 
       - name: Determine Go version from go.mod
         run: echo "GO_VERSION=$(grep "go 1." go.mod | cut -d " " -f 2)" >> $GITHUB_ENV
@@ -79,14 +100,18 @@ jobs:
         run: make package-push-branchtag -e IMG_TAG="${{ steps.extract_branch.outputs.branch }}" -e IMG_REPO=xpkg.upbound.io
 
   open-pr-component:
-    if: github.event.action == 'opened'
     runs-on: ubuntu-latest
+    if: github.event.pull_request.number != 0 && github.event.action == 'opened'
     steps:
+      - name: Get current labels
+        uses: snnaplab/get-labels-action@v1
+
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           repository: ${{ env.COMPONENT_REPO }}
           token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
 
       - name: Extract branch name
         shell: bash
@@ -102,21 +127,44 @@ jobs:
       - name: Generate new golden
         # Act uses the host's docker to run containers, but then
         # they can't access the files that were previously cloned.
-        if: github.event.pull_request.number != 0
+        if: github.event.pull_request.number != 0 && github.event.action == 'opened'
         run: |
           make gen-golden-all
 
+      - name: Check if it's a hotfix
+        id: hotfix_check
+        run: |
+          ${{ contains(fromJSON(env.LABELS), 'hotfix') }} && echo "base=master" >> $GITHUB_OUTPUT || echo "base=develop" >> $GITHUB_OUTPUT
+
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
+        id: cpr
         with:
           token: ${{ secrets.COMPONENT_ACCESS_TOKEN }}
-          title: 'PR for ${{ env.APP_NAME }} on ${{ steps.extract_branch.outputs.branch }}'
-          body: "${{ github.event.pull_request.body}}\nLink: ${{ github.event.pull_request.url }}"
+          title: ${{ github.event.pull_request.title }}
+          body: "${{ github.event.pull_request.body}}\nLink: ${{ github.event.pull_request.html_url }}"
           branch: "${{ env.APP_NAME }}/${{ github.event.pull_request.number }}/${{ steps.extract_branch.outputs.branch }}"
-          base: master
+          base: ${{ steps.hotfix_check.outputs.base }}
           draft: false
+
+      - name: Add link to component PR
+        uses: tzkhan/pr-update-action@v2
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          head-branch-regex: "${{ steps.extract_branch.outputs.branch }}"
+          body-template: |
+            Component PR: ${{ steps.cpr.outputs.pull-request-url }}
+          body-update-action: 'suffix'
+          body-uppercase-base-match: false
+
+      - name: Ignore from Changelog if merge to master
+        uses: actions-ecosystem/action-add-labels@v1
+        if: github.base_ref == 'master'
+        with:
+          labels: ignoreChangelog
+
   create-release:
-    if: github.event.pull_request.merged
+    if: github.event.pull_request.merged && github.base_ref == 'master'
     runs-on: ubuntu-latest
     steps:
       - name: Check for patch label
@@ -201,6 +249,7 @@ jobs:
           repository: ${{ env.COMPONENT_REPO }}
           token: ${{ secrets.COMPONENT_ACCESS_TOKEN }}
           ref: "${{ env.APP_NAME }}/${{ github.event.pull_request.number }}/${{ steps.extract_branch.outputs.branch }}"
+          fetch-depth: 0
 
       - name: Update tag and run golden
         run: |

ci.mk

@@ -33,7 +33,7 @@ docker-push-branchtag: docker-build-branchtag docker-push ## Push docker image w
 .PHONY: package-build
 package-build: docker-build
 	rm -f package/*.xpkg
-	go run github.com/crossplane/crossplane/cmd/crank@v1.16.0 xpkg build -f package --verbose --embed-runtime-image=${IMG}-func -o package/package.xpkg
+	go run github.com/crossplane/crossplane/cmd/crank@v1.16.0 xpkg build -f package --verbose --embed-runtime-image=${IMG} -o package/package.xpkg
 
 .PHONY: package-push
 package-push: package-build
@@ -44,7 +44,7 @@ package-build-branchtag: export IMG_TAG=$(shell git rev-parse --abbrev-ref HEAD
 package-build-branchtag: docker-build-branchtag package-build
 
 .PHONY: package-push-package-branchtag
-package-push-package-branchtag: export IMG_TAG=$(shell git rev-parse --abbrev-ref HEAD | sed 's/\//_/g')
+package-push-branchtag: export IMG_TAG=$(shell git rev-parse --abbrev-ref HEAD | sed 's/\//_/g')
 package-push-branchtag: package-build-branchtag package-push
 
 .PHONY: docker-build-local