From: Christian Marangi <ansuelsmth@gmail.com>
Date: Sat, 22 Apr 2023 00:27:08 +0000 (+0200)
Subject: CI: check-kernel-patches: upload proposed refreshed patches
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7643d95bb31b2cc7412f3738be44a18fa8312cae;p=openwrt%2Fstaging%2Fblocktrron.git

CI: check-kernel-patches: upload proposed refreshed patches

Upload proposed refreshed patches if the check fails.
This should help devs refresh the patches if they don't have access to a
buildroot.

Devs should ALWAYS refresh the patches before submitting and merging
commits.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

diff --git a/.github/workflows/check-kernel-patches.yml b/.github/workflows/check-kernel-patches.yml
index 50a6d1495c..bed70dbd19 100644
--- a/.github/workflows/check-kernel-patches.yml
+++ b/.github/workflows/check-kernel-patches.yml
@@ -131,14 +131,28 @@ jobs:
       - name: Refresh Kernel patches
         shell: su buildbot -c "sh -e {0}"
         working-directory: openwrt
-        run: |
-          make target/linux/refresh V=s
+        run: make target/linux/refresh V=s
 
+      - name: Validate Refreshed Kernel Patches
+        working-directory: openwrt
+        run: |
           . .github/workflows/scripts/ci_helpers.sh
 
           if git diff --name-only --exit-code; then
             success "Kernel patches for ${{ env.TARGET }}/${{ env.SUBTARGET }} seems ok"
           else
             err "Kernel patches for ${{ env.TARGET }}/${{ env.SUBTARGET }} require refresh. (run 'make target/linux/refresh' and force push this pr)"
+            err "You can also check the provided artifacts with the refreshed patch from this CI run."
+            mkdir ${{ env.TARGET }}-${{ env.SUBTARGET }}-refreshed
+            for f in $(git diff --name-only); do
+              cp --parents $f ${{ env.TARGET }}-${{ env.SUBTARGET }}-refreshed/
+            done
             exit 1
           fi
+
+      - name: Upload Refreshed Patches
+        if: failure()
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.TARGET }}-${{ env.SUBTARGET }}-refreshed
+          path: openwrt/${{ env.TARGET }}-${{ env.SUBTARGET }}-refreshed