Choose different defaults for -j in ci/build depending on the runner

Signed-off-by: Nick Avramoussis <[email protected]>

Author: Idclip

.github/workflows/ax.yml

@@ -61,11 +61,11 @@ jobs:
       matrix:
         config:
           # Unified
-          - { image: '2021-clang10', cxx: 'clang++', build: 'Release', j: '8', components: 'core,python,bin,axcore,axbin,axtest' }
-          - { image: '2021-clang10', cxx: 'g++',     build: 'Release', j: '8', components: 'core,python,bin,axcore,axbin,axtest' }
-          - { image: '2022-clang11', cxx: 'clang++', build: 'Debug',   j: '8', components: 'core,python,bin,axcore,axbin,axtest' }
-          - { image: '2022-clang11', cxx: 'clang++', build: 'Release', j: '8', components: 'core,python,bin,axcore,axbin,axtest' }
-          - { image: '2022-clang11', cxx: 'g++',     build: 'Release', j: '8', components: 'core,python,bin,axcore,axbin,axtest' }
+          - { image: '2021-clang10', cxx: 'clang++', build: 'Release', components: 'core,python,bin,axcore,axbin,axtest' }
+          - { image: '2021-clang10', cxx: 'g++',     build: 'Release', components: 'core,python,bin,axcore,axbin,axtest' }
+          - { image: '2022-clang11', cxx: 'clang++', build: 'Debug',   components: 'core,python,bin,axcore,axbin,axtest' }
+          - { image: '2022-clang11', cxx: 'clang++', build: 'Release', components: 'core,python,bin,axcore,axbin,axtest' }
+          - { image: '2022-clang11', cxx: 'g++',     build: 'Release', components: 'core,python,bin,axcore,axbin,axtest' }
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
@@ -85,7 +85,6 @@ jobs:
       - name: build
         run: >
           ./ci/build.sh -v
-          -j ${{ matrix.config.j }}
           --build-type=${{ matrix.config.build }}
           --components=${{ matrix.config.components }}
           --cargs=\"
@@ -100,7 +99,6 @@ jobs:
         if: matrix.config.components == 'core'
         run: >
           ./ci/build.sh -v
-          -j ${{ matrix.config.j }}
           --build-type=${{ matrix.config.build }}
           --components="bin,axcore,axbin,axtest"
           --cargs=\"

.github/workflows/weekly.yml

@@ -178,22 +178,21 @@ jobs:
       matrix:
         config:
           # Unified
-          - { image: '2022-clang14', cxx: 'clang++', build: 'Release', j: '8', components: 'core,bin,axcore,axbin,axtest' }
-          - { image: '2022-clang14', cxx: 'g++',     build: 'Release', j: '8', components: 'core,bin,axcore,axbin,axtest' }
-          - { image: '2022-clang13', cxx: 'clang++', build: 'Release', j: '8', components: 'core,bin,axcore,axbin,axtest' }
-          - { image: '2022-clang13', cxx: 'g++',     build: 'Release', j: '8', components: 'core,bin,axcore,axbin,axtest' }
+          - { image: '2022-clang14', cxx: 'clang++', build: 'Release', components: 'core,bin,axcore,axbin,axtest' }
+          - { image: '2022-clang14', cxx: 'g++',     build: 'Release', components: 'core,bin,axcore,axbin,axtest' }
+          - { image: '2022-clang13', cxx: 'clang++', build: 'Release', components: 'core,bin,axcore,axbin,axtest' }
+          - { image: '2022-clang13', cxx: 'g++',     build: 'Release', components: 'core,bin,axcore,axbin,axtest' }
           # Standalone
-          - { image: '2021-clang10', cxx: 'clang++', build: 'Release', j: '8', components: 'core' }
-          - { image: '2022-clang11', cxx: 'clang++', build: 'Debug',   j: '8', components: 'core' }
-          - { image: '2022-clang11', cxx: 'clang++', build: 'Release', j: '8', components: 'core' }
-          - { image: '2022-clang11', cxx: 'g++',     build: 'Release', j: '8', components: 'core' }
+          - { image: '2021-clang10', cxx: 'clang++', build: 'Release', components: 'core' }
+          - { image: '2022-clang11', cxx: 'clang++', build: 'Debug',   components: 'core' }
+          - { image: '2022-clang11', cxx: 'clang++', build: 'Release', components: 'core' }
+          - { image: '2022-clang11', cxx: 'g++',     build: 'Release', components: 'core' }
       fail-fast: false
     steps:
       - uses: actions/checkout@v3
       - name: build
         run: >
           ./ci/build.sh -v
-          -j ${{ matrix.config.j }}
           --build-type=${{ matrix.config.build }}
           --components=${{ matrix.config.components }}
           --cargs=\"
@@ -208,7 +207,6 @@ jobs:
         if: matrix.config.components == 'core'
         run: >
           ./ci/build.sh -v
-          -j ${{ matrix.config.j }}
           --build-type=${{ matrix.config.build }}
           --components="bin,axcore,axbin,axtest,python"
           --cargs=\"

ci/build.sh

@@ -29,9 +29,15 @@ declare -A PARMS
 PARMS[--components]=core,bin
 PARMS[--target]=install
 PARMS[--build-dir]=build
-# github actions runners have 8 threads
-# https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
-PARMS[-j]=8
+
+if [[ $RUNNER_NAME == *"8c-32g-300h"* ]]; then
+    # ASWF github actions runners have 8 threads
+    PARMS[-j]=8
+else
+    # Github actions runners have 2 threads
+    # https://help.github.com/en/actions/reference/virtual-environments-for-github-hosted-runners
+    PARMS[-j]=2
+fi
 
 # Available options for --components
 declare -A COMPONENTS