Fixing job titles, tidying up run commands

PandABlocks · May 13, 2024 · a4d7884 · a4d7884
1 parent 88671af
commit a4d7884
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 76 deletions.
diff --git a/.github/workflows/_make_boot.yml b/.github/workflows/_make_boot.yml
@@ -1,9 +1,6 @@
 on:
   workflow_call:
 
-env:
-  WORK_DIR: /__w/PandABlocks-FPGA/PandABlocks-FPGA
-
 jobs:
   make_boot:
     strategy:
@@ -28,7 +25,7 @@ jobs:
           path: repos/PandABlocks-fpga
           fetch-depth: 0
 
-      - name: Checkout rootfs, give perms, and adjust path
+      - name: Checkout rootfs and Give Directory Perms
         uses: ./repos/PandABlocks-fpga/.github/actions/setupenv
 
       # Generate bootable image
@@ -39,7 +36,9 @@ jobs:
         timeout-minutes: 60
         run: |
           echo "boot_files=false" >> $GITHUB_OUTPUT
-          cd repos/PandABlocks-fpga && ln -s CONFIG.example CONFIG && make WORK_DIR=$WORK_DIR boot APP_NAME=${{ matrix.app }}
+          cd repos/PandABlocks-fpga
+          ln -s CONFIG.example CONFIG
+          make boot APP_NAME=${{ matrix.app }}
           if test -f /build/boot*.zip; then
             echo "boot_files=true" >> $GITHUB_OUTPUT
           fi

diff --git a/.github/workflows/_make_zpkg.yml b/.github/workflows/_make_zpkg.yml
@@ -33,15 +33,17 @@ jobs:
           path: repos/PandABlocks-fpga
           fetch-depth: 0
 
-      - name: Checkout rootfs, give perms, and adjust path
+      - name: Checkout rootfs and Give Directory Perms
         uses: ./repos/PandABlocks-fpga/.github/actions/setupenv
 
       # Make zpkgs
       - name: build carrier_ip and zpkg
         id: make_zpkg
         run: |
-          cd repos/PandABlocks-fpga && ln -s CONFIG.example CONFIG && make WORK_DIR=$WORK_DIR carrier_ip APP_NAME=${{ matrix.app }} && make WORK_DIR=$WORK_DIR zpkg APP_NAME=${{ matrix.app }}
-          exit
+          cd repos/PandABlocks-fpga
+          ln -s CONFIG.example CONFIG
+          make WORK_DIR=$WORK_DIR carrier_ip APP_NAME=${{ matrix.app }}
+          make WORK_DIR=$WORK_DIR zpkg APP_NAME=${{ matrix.app }}
 
       # Artifacts
       - name: Upload zpkg

diff --git a/.github/workflows/_test.yml b/.github/workflows/_test.yml
diff --git a/.github/workflows/_test_matrix.yml b/.github/workflows/_test_matrix.yml
@@ -1,8 +1,11 @@
 on:
-    workflow_call:
-      outputs:
-        matrix: 
-            value: ${{ jobs.test_matrix.outputs.matrix }}
+  workflow_call:
+    outputs:
+      matrix: 
+          value: ${{ jobs.test_matrix.outputs.matrix }}
+
+env:
+  WORK_DIR: /__w/PandABlocks-FPGA/PandABlocks-FPGA
 
 jobs:
     test_matrix:
@@ -23,7 +26,7 @@ jobs:
         - name: Evaluate number of modules/tests & generate job matrix
           id: make_matrix
           run: |
-               bash /__w/PandABlocks-FPGA/PandABlocks-FPGA/repos/PandABlocks-fpga/.github/scripts/Find_Tests.sh "/__w/PandABlocks-FPGA/PandABlocks-FPGA/repos/PandABlocks-fpga/modules" "/__w/PandABlocks-FPGA/PandABlocks-FPGA/repos/PandABlocks-fpga/.github/scripts"
+               bash $WORK_DIR/repos/PandABlocks-fpga/.github/scripts/Find_Tests.sh "$WORK_DIR/repos/PandABlocks-fpga/modules" "$WORK_DIR/repos/PandABlocks-fpga/.github/scripts"
                json_content=$(cat github_tests.json)
                echo "::set-output name=matrix::$json_content"
                echo "$json_content"
diff --git a/.github/workflows/_test_python_autogen.yml b/.github/workflows/_test_python_autogen.yml
@@ -1,8 +1,5 @@
 on:
     workflow_call:
-
-env:
-  WORK_DIR: /__w/PandABlocks-FPGA/PandABlocks-FPGA
 
 jobs:
     test_python_autogen:
@@ -20,10 +17,14 @@ jobs:
             path: repos/PandABlocks-fpga
             fetch-depth: 0
 
-        - name: Checkout rootfs and give runner perms
+        - name: Checkout rootfs and Give Directory Perms
           uses: ./repos/PandABlocks-fpga/.github/actions/setupenv
 
         # Run tests
-        - name: Make python and hdl tests
-          id: python_hdl_tests
-          run: cd repos/PandABlocks-fpga && ln -s CONFIG.example CONFIG && make WORK_DIR=$WORK_DIR python_tests && make WORK_DIR=$WORK_DIR python_timing && make WORK_DIR=$WORK_DIR autogen
+        - name: Make Python Tests
+          run: |
+            cd repos/PandABlocks-fpga
+            ln -s CONFIG.example CONFIG
+            make python_tests
+            make python_timing
+            make autogen
diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
@@ -12,22 +12,7 @@ on:
 
 jobs:
 
-  # Generate job matrix to evenly split tests
-  test_matrix:
-    uses: ./.github/workflows/_test_matrix.yml
-
-  # python and autogen tests
-  test_python_autogen:
-    uses: ./.github/workflows/_test_python_autogen.yml
-
-  # hdl tests
-  test:
-    needs: [test_matrix, test_python_autogen]
-    uses: ./.github/workflows/_test.yml
-    with:
-      matrix: ${{needs.test_matrix.outputs.matrix}}
-
-  # Make Boot files
+    # Make Boot files
   make_boot:
     uses: ./.github/workflows/_make_boot.yml
 
@@ -37,10 +22,25 @@ jobs:
 
   # Optional revert on failed push workflow
   undo:
-    needs: [ make_boot, make_zpkg, test ]
+    needs: [ make_boot, make_zpkg, test_hdl ]
     uses: ./.github/workflows/_undo.yml
 
   # Release on push to tag
   release:
-    needs: [ make_boot, make_zpkg, test, test_matrix, test_python_autogen ]
-    uses: ./.github/workflows/_release.yml
+    needs: [ make_boot, make_zpkg, test_hdl, test_matrix, test_python_autogen ]
+    uses: ./.github/workflows/_release.yml
+
+  # Generate job matrix to evenly split tests
+  test_matrix:
+    uses: ./.github/workflows/_test_matrix.yml
+
+  # python and autogen tests
+  test_python_autogen:
+    uses: ./.github/workflows/_test_python_autogen.yml
+
+  # hdl tests
+  test_hdl:
+    needs: [test_matrix, test_python_autogen]
+    uses: ./.github/workflows/_test_hdl.yml
+    with:
+      matrix: ${{needs.test_matrix.outputs.matrix}}