Update workflow

Cimos · Aug 18, 2024 · 281daa6 · 281daa6
1 parent 604908a
commit 281daa6
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 10 deletions.
diff --git a/.github/workflows/datapack.yaml b/.github/workflows/datapack.yaml
@@ -1,8 +1,17 @@
 name: Generate Datapack
-on: [push, pull_request]
+on: 
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - master
+
 jobs:
   build:
     runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+
     steps:
     - name: Checkout (only last commit)
       uses: actions/checkout@v4
@@ -26,13 +35,14 @@ jobs:
         dir: output
         schema: '${{ env.PROJECT_NAME }}.kicad_sch'
         board: '${{ env.PROJECT_NAME }}.kicad_pcb'
-        logfile: 'logfile.log'
+        logfile: 'logfile/logfile.log'
         # verbose: 2
 
     - name: Upload logfile
+      if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.PROJECT_NAME }}-lofile
+        name: ${{ env.PROJECT_NAME }}-logfile
         path: logfile
 
     - name: Upload Results

diff --git a/.github/workflows/panelization.yaml b/.github/workflows/panelization.yaml
@@ -1,10 +1,17 @@
 name: Generate PCB panel datapack
-on: [push, pull_request]
+on: 
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - master
+
 jobs:
   KiKit:
     name: Test Build 
     runs-on: ubuntu-latest
-    container: ghcr.io/inti-cmnb/kicad8_auto_full:latest
+    if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
 
     steps:
     - name: Checkout (only last commit)
@@ -36,7 +43,7 @@ jobs:
         dir: output
         schema: '${{ env.PROJECT_NAME }}.kicad_sch'
         board: '${{ env.PROJECT_NAME }}.kicad_pcb'
-        logfile: 'logfile.log'
+        logfile: 'logfile/logfile.log'
         # verbose: 2
 
     - name: Build panel datapack
@@ -47,14 +54,15 @@ jobs:
         dir: output
         schema: '${{ env.PROJECT_NAME }}.kicad_sch'
         board: '${{ env.PROJECT_NAME }}.kicad_pcb'
-        logfile: 'logfile.log'
+        logfile: 'logfile/logfile.log'
         # verbose: 2
 
     - name: Upload logfile
+      if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: ${{ env.PROJECT_NAME }}-lofile
-        path: logfile
+        name: ${{ env.PROJECT_NAME }}-panel-logfile
+        path: logfile/logfile.log
 
     - name: Upload datapack results
       uses: actions/upload-artifact@v4

diff --git a/panelization.yaml b/panelization.yaml
@@ -9,5 +9,5 @@ outputs:
       configs:
         - name: base # Keep this name the same
           layout:
-            rows: 2
+            rows: 3
             cols: 2