Merge branch 'main' into bug6076

.github/workflows/release.yml

@@ -13,14 +13,16 @@ on:
       local_target_platform:
         description: Build with a local target platform (set to "true" to use local target platform)
         default: 'false'
+      runner_cpus:
+        description: Default is 16, but can be 4, 8, and 64 as well
+        default: '16'
 
 jobs:
   build:
     permissions:
       contents: write
       checks: write
-    runs-on: ubuntu-latest-64cpu
-    #runs-on: ubuntu-latest-4cpu
+    runs-on: ubuntu-latest-${{ github.event.inputs.runner_cpus }}cpu
     steps:
       - name: Allocate swap space
         shell: bash
@@ -63,7 +65,7 @@ jobs:
           APP_PARAMETERS: "-Daws.region=eu-west-1 -Dgoogle.maps.authenticationparams=${{ secrets.GOOGLE_MAPS_AUTHENTICATIONPARAMS }} -Daws.s3.test.s3AccessId=${{ secrets.AWS_S3_TEST_S3ACCESSID }} -Daws.s3.test.s3AccessKey=${{ secrets.AWS_S3_TEST_S3ACCESSKEY }}"
           JAVA8_HOME: ${{env.JAVA_HOME_8_X64}}
         run: |
-            ./configuration/buildAndUpdateProduct.sh -x 60 ${{ github.event.inputs.skip_tests == 'true' && '-t' || '' }} ${{ github.event.inputs.local_target_platform == 'true' && '-v' || '' }} build 2>&1
+            ./configuration/buildAndUpdateProduct.sh -x ${{ github.event.inputs.runner_cpus }} ${{ github.event.inputs.skip_tests == 'true' && '-t' || '' }} ${{ github.event.inputs.local_target_platform == 'true' && '-v' || '' }} build 2>&1
       - name: Upload build log
         uses: actions/upload-artifact@v4
         if: always()