Skip to content

Commit 8feebb6

Browse files
committed
Refactor slightly the way in which release builds are organised
1 parent 9ce00be commit 8feebb6

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

.github/workflows/build-release.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,20 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
os: [macos-10.15, windows-2019]
17-
# has no effect on Windows, no problem
18-
cxx: [clang++]
16+
# specify a specific compiler to build with each OS separately
17+
include:
18+
- os: macos-10.15
19+
cxx: clang++
20+
nickname: macos
1921
include:
20-
# override compiler when on Ubuntu to g++-10 (chooses g++-9 by default)
2122
- os: ubuntu-20.04
2223
cxx: g++-10
24+
nickname: linux
25+
include:
26+
# NOTE: CXX seems to be ignored on Windows, but specify it anyway for consistency
27+
- os: windows-2019
28+
cxx: msvc
29+
nickname: windows
2330

2431
steps:
2532
- uses: actions/checkout@v2
@@ -51,5 +58,5 @@ jobs:
5158
- name: Upload
5259
uses: actions/upload-artifact@v2
5360
with:
54-
name: build_${{ github.sha }}_${{ matrix.os }}
61+
name: build_${{ github.sha }}_${{ matrix.nickname }}
5562
path: ${{github.workspace}}/artifacts

.github/workflows/continuous-integration.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
os: [macos-10.15, ubuntu-20.04]
15-
# has no effect on Windows, no problem
1615
cxx: [g++-10, clang++]
1716
include:
1817
- os: windows-2019

0 commit comments

Comments
 (0)