Skip to content

Commit 6204699

Browse files
authored
refactor action matrix (#375)
1 parent 8e44d05 commit 6204699

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

.github/workflows/build_test.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ env:
1717

1818
jobs:
1919
build:
20-
runs-on: ${{ matrix.config.os }}
20+
runs-on: ${{ matrix.os }}
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
config:
24+
include:
2525
- { os: ubuntu-24.04, compiler: clang-16 }
2626
- { os: ubuntu-24.04, compiler: gcc-12 }
2727
- { os: macos-13, compiler: clang-14 }
@@ -54,7 +54,7 @@ jobs:
5454
- name: conan login
5555
run: conan remote login odr admin --password ${{ secrets.ARTIFACTORY }}
5656
- name: conan config
57-
run: conan config install .github/config/${{ matrix.config.os }}-${{ matrix.config.compiler }}/conan
57+
run: conan config install .github/config/${{ matrix.os }}-${{ matrix.compiler }}/conan
5858
- name: conan install
5959
run: conan install . --output-folder=build --build=missing
6060

@@ -64,9 +64,9 @@ jobs:
6464
path: |
6565
~/.ccache
6666
/Users/runner/Library/Caches/ccache
67-
key: ${{ matrix.config.os }}-${{ matrix.config.compiler }}-${{ env.CCACHE_KEY_SUFFIX }}
67+
key: ${{ matrix.os }}-${{ matrix.compiler }}-${{ env.CCACHE_KEY_SUFFIX }}
6868
restore-keys: |
69-
${{ matrix.config.os }}-${{ matrix.config.compiler }}-
69+
${{ matrix.os }}-${{ matrix.compiler }}-
7070
7171
- name: cmake
7272
run: >
@@ -89,14 +89,14 @@ jobs:
8989
- name: upload binaries to github
9090
uses: actions/upload-artifact@v4
9191
with:
92-
name: bin-${{ matrix.config.os }}-${{ matrix.config.compiler }}
92+
name: bin-${{ matrix.os }}-${{ matrix.compiler }}
9393
path: |
9494
install
9595
build/test/odr_test
9696
9797
docker:
9898
needs: build
99-
runs-on: ${{ matrix.config.os }}
99+
runs-on: ${{ matrix.os }}
100100
strategy:
101101
fail-fast: false
102102
matrix:
@@ -136,7 +136,7 @@ jobs:
136136
- name: download binaries
137137
uses: actions/download-artifact@v4
138138
with:
139-
name: bin-${{ matrix.config.os }}-${{ matrix.config.compiler }}
139+
name: bin-${{ matrix.os }}-${{ matrix.compiler }}
140140
path: cli
141141

142142
- name: Build and push
@@ -153,7 +153,7 @@ jobs:
153153

154154
test:
155155
needs: build
156-
runs-on: ${{ matrix.config.os }}
156+
runs-on: ${{ matrix.os }}
157157
strategy:
158158
fail-fast: false
159159
matrix:
@@ -184,7 +184,7 @@ jobs:
184184
- name: download binaries
185185
uses: actions/download-artifact@v4
186186
with:
187-
name: bin-${{ matrix.config.os }}-${{ matrix.config.compiler }}
187+
name: bin-${{ matrix.os }}-${{ matrix.compiler }}
188188
path: .
189189
- name: fix artifact permissions
190190
run: chmod +x build/test/odr_test
@@ -214,11 +214,11 @@ jobs:
214214
build/test/output/odr-private/output
215215
216216
build-test-downstream:
217-
runs-on: ${{ matrix.config.os }}
217+
runs-on: ${{ matrix.os }}
218218
strategy:
219219
fail-fast: false
220220
matrix:
221-
config:
221+
include:
222222
- { os: ubuntu-24.04, compiler: clang-16 }
223223
- { os: ubuntu-24.04, compiler: gcc-12 }
224224
- { os: macos-13, compiler: clang-14 }
@@ -249,7 +249,7 @@ jobs:
249249
- name: conan remote
250250
run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
251251
- name: conan config
252-
run: conan config install .github/config/${{ matrix.config.os }}-${{ matrix.config.compiler }}/conan
252+
run: conan config install .github/config/${{ matrix.os }}-${{ matrix.compiler }}/conan
253253

254254
- name: conan odrcore
255255
run: conan export . --name odrcore --version 0.0.0

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ on:
66

77
jobs:
88
build:
9-
runs-on: ${{ matrix.config.os }}
9+
runs-on: ${{ matrix.os }}
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
config:
13+
include:
1414
- { os: ubuntu-24.04, compiler: clang-15 }
1515
steps:
1616
- name: checkout
@@ -28,7 +28,7 @@ jobs:
2828
- name: conan login
2929
run: conan remote login odr admin --password ${{ secrets.ARTIFACTORY }}
3030
- name: conan config
31-
run: conan config install .github/config/${{ matrix.config.os }}-${{ matrix.config.compiler }}/conan
31+
run: conan config install .github/config/${{ matrix.os }}-${{ matrix.compiler }}/conan
3232

3333
- name: get version
3434
run: echo "VERSION=${GITHUB_REF_NAME:1}" >> $GITHUB_ENV

.github/workflows/tidy.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ concurrency:
1212

1313
jobs:
1414
build:
15-
runs-on: ${{ matrix.config.os }}
15+
runs-on: ${{ matrix.os }}
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
config:
19+
include:
2020
- { os: ubuntu-24.04, compiler: clang-16 }
2121
steps:
2222
- name: checkout
@@ -34,7 +34,7 @@ jobs:
3434
- name: conan remote
3535
run: conan remote add --index 0 odr https://artifactory.opendocument.app/artifactory/api/conan/conan
3636
- name: conan config
37-
run: conan config install .github/config/${{ matrix.config.os }}-${{ matrix.config.compiler }}/conan
37+
run: conan config install .github/config/${{ matrix.os }}-${{ matrix.compiler }}/conan
3838
- name: conan install
3939
run: conan install . --output-folder=build --build=missing
4040

0 commit comments

Comments
 (0)