Skip to content

Commit e05108e

Browse files
committed
PG-1467 Add clang builds
1 parent c362014 commit e05108e

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

.github/workflows/psp-matrix.yml

+2
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: ['ubuntu-22.04']
15+
compiler: [gcc, clang]
1516
build_type: [debug,debugoptimized]
1617
build_script: [make, meson]
1718
uses: ./.github/workflows/psp-reusable.yml
1819
with:
1920
os: ${{ matrix.os }}
21+
compiler: ${{ matrix.compiler }}
2022
build_type: ${{ matrix.build_type }}
2123
build_script: ${{ matrix.build_script }}
2224
secrets: inherit

.github/workflows/psp-reusable.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
os:
66
type: string
77
required: true
8+
compiler:
9+
type: string
10+
required: true
811
build_type:
912
type: string
1013
required: true
@@ -13,8 +16,10 @@ on:
1316
required: true
1417

1518
env:
16-
artifact_name: build-${{ inputs.os }}-${{ inputs.build_script }}-${{ inputs.build_type }}
17-
coverage_artifact_name: coverage-build-${{ inputs.os }}-${{ inputs.build_script }}-${{ inputs.build_type }}
19+
artifact_name: build-${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.build_script }}-${{ inputs.build_type }}
20+
coverage_artifact_name: coverage-build-${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.build_script }}-${{ inputs.build_type }}
21+
CC: ${{ inputs.compiler }}
22+
CXX: ${{ inputs.compiler }}
1823

1924
jobs:
2025
build:
@@ -49,7 +54,7 @@ jobs:
4954
build-coverage:
5055
name: Build PSP for Coverage
5156
runs-on: ${{ inputs.os }}
52-
if: inputs.build_script == 'make' && inputs.build_type == 'debug'
57+
if: inputs.build_script == 'make' && inputs.build_type == 'debug' && inputs.copmiler == 'gcc'
5358
steps:
5459
- name: Clone repository
5560
uses: actions/checkout@v4
@@ -154,7 +159,7 @@ jobs:
154159
test_tde_coverage:
155160
name: Generate Codecov Code Coverage
156161
runs-on: ${{ inputs.os }}
157-
if: inputs.build_script == 'make' && inputs.build_type == 'debug'
162+
if: inputs.build_script == 'make' && inputs.build_type == 'debug' && inputs.copmiler == 'gcc'
158163
needs: build
159164

160165
steps:

0 commit comments

Comments
 (0)