Use a script to apply the strict patch (#453) (#461)

.github/workflows/strict-integration.yaml

@@ -25,9 +25,7 @@ jobs:
           sudo snap install snapcraft --classic
       - name: Apply strict patch
         run: |
-          git config --global user.email [email protected]
-          git config --global user.name k8s-bot
-          git am ./build-scripts/patches/strict/*.patch
+          ./build-scripts/patches/strict/apply
       - name: Build snap
         run: |
           sg lxd -c 'snapcraft --use-lxd'

.github/workflows/strict.yaml

@@ -39,9 +39,7 @@ jobs:
       - name: Apply strict patch
         run: |
           git checkout -b ${{ needs.prepare.outputs.strict }}
-          git config --global user.email [email protected]
-          git config --global user.name k8s-bot
-          git am ./build-scripts/patches/strict/*.patch
+          ./build-scripts/patches/strict/apply
       - name: Push to ${{ needs.prepare.outputs.strict }}
         run: |
           git push origin --force ${{ needs.prepare.outputs.strict }}

build-scripts/patches/strict/apply

@@ -0,0 +1,10 @@
+#!/bin/bash -xe
+
+DIR="$(realpath "$(dirname "${0}")")"
+
+# Configure git author
+git config user.email [email protected]
+git config user.name k8s-bot
+
+# Apply strict patch
+git am "${DIR}/0001-Strict-patch.patch"