ci: Rework ARC name generation

Signed-off-by: Kostis Papazafeiropoulos <[email protected]>
nubificus · Sep 16, 2024 · 9d0b303 · 9d0b303
1 parent 3829d2c
commit 9d0b303
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 28 deletions.
diff --git a/.github/workflows/pr-build-and-verify.yml b/.github/workflows/pr-build-and-verify.yml
@@ -18,27 +18,27 @@ jobs:
     uses: ./.github/workflows/test-build.yml
     secrets: inherit
 
-  verify_build:
-    name: Verify Build
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'ok-to-test') }}
-    uses: ./.github/workflows/verify-build.yml
-    secrets: inherit
-
-  validate_files_and_commits:
-    name: Validate Files and Commits
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'ok-to-test') }}
-    uses: ./.github/workflows/validate-files-and-commits.yml
-    secrets: inherit
-
-  validate_code:
-    name: Validate Code
-    if: ${{ contains(github.event.pull_request.labels.*.name, 'ok-to-test') }}
-    uses: ./.github/workflows/validate-code.yml
-    secrets: inherit
-
-  generate_coverage:
-    needs: [test_build, verify_build, validate_files_and_commits, validate_code]
-    name: Generate Coverage Report
-    uses: ./.github/workflows/coverage-report.yml
-    with:
-      comment-diff: true
+#  verify_build:
+#    name: Verify Build
+#    if: ${{ contains(github.event.pull_request.labels.*.name, 'ok-to-test') }}
+#    uses: ./.github/workflows/verify-build.yml
+#    secrets: inherit
+#
+#  validate_files_and_commits:
+#    name: Validate Files and Commits
+#    if: ${{ contains(github.event.pull_request.labels.*.name, 'ok-to-test') }}
+#    uses: ./.github/workflows/validate-files-and-commits.yml
+#    secrets: inherit
+#
+#  validate_code:
+#    name: Validate Code
+#    if: ${{ contains(github.event.pull_request.labels.*.name, 'ok-to-test') }}
+#    uses: ./.github/workflows/validate-code.yml
+#    secrets: inherit
+#
+#  generate_coverage:
+#    needs: [test_build, verify_build, validate_files_and_commits, validate_code]
+#    name: Generate Coverage Report
+#    uses: ./.github/workflows/coverage-report.yml
+#    with:
+#      comment-diff: true
diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
@@ -8,7 +8,7 @@ on:
         default: '["gcc", "lite", "2204"]'
       runner-archs:
         type: string
-        default: '["x86_64", "aarch64", "armv7l"]'
+        default: '["amd64", "aarch64", "armv7l"]'
       options:
         type: string
         default: 'auto_features=enabled'
@@ -29,19 +29,22 @@ on:
 jobs:
   test_build:
     name: Test Build
-    runs-on: ${{ matrix.group }} #] #, "${{ fromJSON(inputs.runner) }}"]
+    #runs-on: ${{ matrix.group }} #] #, "${{ fromJSON(inputs.runner) }}"]
+    runs-on: ${{ format('{0}-{1}', join(fromJSON(inputs.runner), '-'), matrix.arch) }}
 
     strategy:
       matrix:
         #archconfig: ["${{ fromJSON(inputs.runner-archs) }}"]
         #group: ${{ fromJson(needs.generate-matrix.outputs.runner_group) }}
         #group: ${{ fromJson(inputs.runner-archs) | map(if . == 'x86_64' then 'gcc-lite-2204-amd64' else 'gcc-lite-2204-' + . end) }}
-        group: ${{ fromJson(github.event.inputs.runner-archs) | map( 'gcc-lite-2204-' + (replace(., 'x86_64', 'amd64')) ) | join(',') }}
-
+        #group: ${{ fromJson(github.event.inputs.runner-archs) | map( 'gcc-lite-2204-' + (replace(., 'x86_64', 'amd64')) ) | join(',') }}
+        #arch: [ {ci: x86_64, runner: amd64}, {ci: aarch64, runner: arm64}, {ci: armv7l, runner: armv7l} ]
+        arch: ["${{ fromJSON(inputs.runner-archs) }}" ]
         build_type: [debug, release]
       fail-fast: false
 
     env:
+      ARCH: "${{ fromJson('{"amd64": "x86_64", "aarch64": "aarch64", "armv7l": "armv7l"}')[matrix.arch] }}"
       CC: gcc-12
       CXX: g++-12
     steps: