Skip to content

Commit

Permalink
CI: Add MacOS support
Browse files Browse the repository at this point in the history
Also switch the matrix to use manual entries instead
of a multiplication of dimensions, as there are too
many exceptions.
  • Loading branch information
Geod24 committed Feb 7, 2024
1 parent 43fbc8e commit c4da742
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 8 deletions.
20 changes: 13 additions & 7 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,19 @@ jobs:
strategy:
fail-fast: false
matrix:
os:
- { name: ubuntu-20.04, arch: x86_64-linux-gnu-ubuntu-20.04 }
dc:
- ldc-latest
target:
- { name: g++-9, compiler: g++, cxx-version: 9.4.0 }
- { name: clang-13, compiler: clang, cxx-version: 13.0.0 }
include:
- os: { name: ubuntu-20.04, arch: x86_64-linux-gnu-ubuntu-20.04 }
target: { name: g++-9, compiler: g++, cxx-version: 9.4.0 }
dc: ldc-latest
- os: { name: ubuntu-20.04, arch: x86_64-linux-gnu-ubuntu-20.04 }
target: { name: clang-13, compiler: clang, cxx-version: 13.0.0 }
dc: ldc-latest
- os: { name: macOS-12, arch: x86_64-apple-darwin }
target: { name: clang-15, compiler: clang, cxx-version: 13.0.0 }
dc: ldc-latest
# - os: { name: macOS-13-xlarge, arch: arm64-apple-darwin }
# target: { name: clang-15, compiler: clang, cxx-version: 15.0.1 }
# dc: ldc-latest

# Using a specific version for reproductibility.
# Feel free to update when a new release has matured.
Expand Down
4 changes: 3 additions & 1 deletion dub.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
},
{
"name": "unittest",
"lflags": [ "-lstdc++" ],
"lflags-posix": [ "-lstdc++" ],
"lflags-linux": [ "--export-dynamic" ],
"lflags-osx": [ "-export_dynamic" ],
"preGenerateCommands": [
"$PACKAGE_DIR/extras/cxx-wrapper.sh vector",
"$PACKAGE_DIR/extras/cxx-wrapper.sh list"
Expand Down

0 comments on commit c4da742

Please sign in to comment.