Skip to content

Commit d53b826

Browse files
ci: Use Apple Clang 16 to support C++20 on macOS 14; Drop support for Ubuntu 20.04. (#29)
Co-authored-by: kirkrodrigues <[email protected]>
1 parent 4e701d8 commit d53b826

File tree

2 files changed

+17
-35
lines changed

2 files changed

+17
-35
lines changed

.github/workflows/code-linting-checks.yaml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
strategy:
2222
matrix:
2323
os:
24-
- "macos-latest"
25-
- "ubuntu-latest"
24+
- "macos-15"
25+
- "ubuntu-24.04"
2626
runs-on: "${{matrix.os}}"
2727
steps:
2828
- uses: "actions/checkout@v4"
@@ -37,17 +37,6 @@ jobs:
3737
shell: "bash"
3838
run: "npm install -g @go-task/cli"
3939

40-
- if: "matrix.os == 'macos-latest'"
41-
name: "Install coreutils (for md5sum)"
42-
run: "brew install coreutils"
43-
44-
- name: "Log tool versions"
45-
run: |-
46-
md5sum --version
47-
python --version
48-
tar --version
49-
task --version
50-
5140
- name: "Run lint task"
5241
shell: "bash"
5342
run: "task lint:check"

.github/workflows/unit-tests.yaml

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
strategy:
2222
matrix:
2323
os:
24-
- "macos-latest"
25-
- "ubuntu-20.04"
24+
- "macos-14"
25+
- "macos-15"
2626
- "ubuntu-22.04"
2727
- "ubuntu-24.04"
2828
runs-on: "${{matrix.os}}"
@@ -39,27 +39,20 @@ jobs:
3939
shell: "bash"
4040
run: "npm install -g @go-task/cli"
4141

42-
- if: "matrix.os == 'macos-latest'"
43-
name: "Install coreutils (for md5sum)"
44-
run: "brew install coreutils"
45-
46-
- if: "matrix.os == 'ubuntu-20.04'"
47-
name: "Install gcc-10 (for c++20)"
48-
run: |-
49-
sudo apt-get update
50-
sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
51-
g++-10 \
52-
gcc-10
53-
sudo ln --symbolic --force /usr/bin/gcc-10 /usr/bin/cc
54-
sudo ln --symbolic --force /usr/bin/g++-10 /usr/bin/c++
55-
sudo ln --symbolic --force /usr/bin/cpp-10 /usr/bin/cpp
56-
57-
- name: "Log tool versions"
42+
- if: "'macos-14' == matrix.os"
43+
name: "Install macOS 14 deps: coreutils (for md5sum) and Apple Clang 16 (for C++20)"
5844
run: |-
59-
command -v md5sum
60-
command -v python
61-
command -v tar
62-
command -v task
45+
brew install coreutils
46+
brew install llvm@16
6347
6448
- name: "Run unit tests"
49+
env: >-
50+
${{
51+
'macos-14' == matrix.os
52+
&& fromJson('{
53+
"CC": "/opt/homebrew/opt/llvm@16/bin/clang",
54+
"CXX": "/opt/homebrew/opt/llvm@16/bin/clang++"
55+
}')
56+
|| fromJson('{}')
57+
}}
6558
run: "task test-all"

0 commit comments

Comments
 (0)