Merge branch 'main' of github.com:jakkra/ZSWatch-HW into 2.0.5_Dev

.github/workflows/build.yml

@@ -1,8 +1,9 @@
 name: Build
 
 on:
-  push:
-  pull_request:
+  pull_request_target:
+    types:
+      - closed
 
 jobs:
   build:
@@ -23,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: .
           submodules: recursive
@@ -53,22 +54,24 @@ jobs:
       - name: Initialize
         run: |
           mkdir -p docs/images/
-          mkdir production
+          mkdir -p production
 
       - name: Generate files
         run: |
           cd project
           kibot -g variant=${{ matrix.device_type }} -d ../production/${{ matrix.device_type }}
+          mkdir ../production/${{ matrix.device_type }}/ordering
+          mv ../production/PCBWay ../production/${{ matrix.device_type }}/ordering/PCBWay
 
       - name: Upload Results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.device_type }}
           path: |
             production
           if-no-files-found: ignore
 
-      - if: ${{ matrix.NewImage }}
+      - if: ${{ matrix.NewImage && (github.event.pull_request.merged == true) }}
         name: Update image
         run: |
           git config --local user.name "github-actions[bot]"
@@ -78,4 +81,4 @@ jobs:
           git commit -m "Add image from CI/CD action"
           git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
           echo https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-          git push origin ${{ steps.extract_branch.outputs.branch }}
+          git push origin ${{ github.base_ref }}

README.md

@@ -1,7 +1,7 @@
 # ZSWatch Hardware
 
 [![License](https://img.shields.io/badge/License-GPL%203.0-blue.svg)](https://opensource.org/license/gpl-3-0/)
-![Badge](https://github.com/kampi/zswatch-hw/actions/workflows/build.yml/badge.svg?color=yellow)
+![Badge](https://github.com/jakkra/zswatch-hw/actions/workflows/build.yml/badge.svg?color=yellow)
 
 ## Table of Contents