tidy up

Author: dkfellows

.github/workflows/c_actions.yml

@@ -22,35 +22,29 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-20.04
-    # Note: Python is needed for spinn_utilities.make_tools when building
-    strategy:
-      matrix:
-        python-version: [3.6]
 
     steps:
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: Install Ubuntu dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install vera++ doxygen gcc-arm-none-eabi --fix-missing
+
+    - name: Set up Python 3.6
+      # Note: Python is needed for spinn_utilities.make_tools when building
       uses: actions/setup-python@v2
       with:
-        python-version: ${{ matrix.python-version }}
-        
+        python-version: 3.6
+
     - name: Checkout
       uses: actions/checkout@v2
-      
+
     - name: Checkout SupportScripts
       uses: actions/checkout@v2
       with:
         repository: SpiNNakerManchester/SupportScripts
         path: support
-        
-    - name: Set SPINN_DIRS and NEURAL_MODELLING
-      run: |
-        echo "Set SPINN_DIRS to $PWD/spinnaker_tools"
-        echo "SPINN_DIRS=$PWD/spinnaker_tools" >> $GITHUB_ENV
-        echo "Set NEURAL_MODELLING to $PWD/neural_modelling"
-        echo "NEURAL_MODELLING_DIRS=$PWD/neural_modelling" >> $GITHUB_ENV
-        
+
     - name: Checkout SpiNNaker Dependencies
       run: |
         support/gitclone2.sh https://github.com/SpiNNakerManchester/spinnaker_tools.git
@@ -59,26 +53,33 @@ jobs:
         # Note: SpiNNUtils needed for spinn_utilities.make_tools
         support/gitclone2.sh https://github.com/SpiNNakerManchester/SpiNNUtils.git
 
+    - name: Set SPINN_DIRS and NEURAL_MODELLING
+      run: |
+        echo "Set SPINN_DIRS to $PWD/spinnaker_tools"
+        echo "SPINN_DIRS=$PWD/spinnaker_tools" >> $GITHUB_ENV
+        echo "Set NEURAL_MODELLING to $PWD/neural_modelling"
+        echo "NEURAL_MODELLING_DIRS=$PWD/neural_modelling" >> $GITHUB_ENV
+
     - name: Install SpiNNUtils
       run: python setup.py install
       working-directory: SpiNNUtils
-        
-    - name: Install Ubuntu dependencies
-      run: sudo apt-get update && sudo apt-get install vera++ doxygen gcc-arm-none-eabi --fix-missing
-    
+
     - name: Lint C code using Vera++
       # Note: run this before building to avoid linting modified_src directories
-      run: |
-        support/run-vera.sh neural_modelling/src
-        
-    - name: Build C code
+      run: support/run-vera.sh neural_modelling/src
+
+    - name: Build C dependencies
       run: |
         make -C $SPINN_DIRS
         make -C spinn_common install
         make -C SpiNNFrontEndCommon/c_common install
-        make -C $NEURAL_MODELLING_DIRS doxysetup
-        CFLAGS=-fdiagnostics-color make -C neural_modelling
-        
+
+    - name: Build C code
+      run: make
+      working-directory: neural_modelling
+      env:
+        CFLAGS: -fdiagnostics-color=always
+
     - name: Build documentation using doxygen
-      run: |
-        make -C $NEURAL_MODELLING_DIRS doxygen
+      run: make doxysetup doxygen
+      working-directory: neural_modelling