Skip to content

Commit e7c852f

Browse files
committed
Update macos-14 to use clang-16 and update OS choices for linting
1 parent 4e701d8 commit e7c852f

File tree

2 files changed

+17
-20
lines changed

2 files changed

+17
-20
lines changed

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

Lines changed: 3 additions & 10 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,10 @@ jobs:
3737
shell: "bash"
3838
run: "npm install -g @go-task/cli"
3939

40-
- if: "matrix.os == 'macos-latest'"
40+
- if: "matrix.os == 'macos-15'"
4141
name: "Install coreutils (for md5sum)"
4242
run: "brew install coreutils"
4343

44-
- name: "Log tool versions"
45-
run: |-
46-
md5sum --version
47-
python --version
48-
tar --version
49-
task --version
50-
5144
- name: "Run lint task"
5245
shell: "bash"
5346
run: "task lint:check"

.github/workflows/unit-tests.yaml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
strategy:
2222
matrix:
2323
os:
24-
- "macos-latest"
24+
- "macos-14"
25+
- "macos-15"
2526
- "ubuntu-20.04"
2627
- "ubuntu-22.04"
2728
- "ubuntu-24.04"
@@ -39,10 +40,17 @@ jobs:
3940
shell: "bash"
4041
run: "npm install -g @go-task/cli"
4142

42-
- if: "matrix.os == 'macos-latest'"
43+
- if: "matrix.os == 'macos-14' || matrix.os == 'macos-15'"
4344
name: "Install coreutils (for md5sum)"
4445
run: "brew install coreutils"
4546

47+
- if: "matrix.os == 'macos-14'"
48+
name: "Install clang-16 (for c++20)"
49+
run: |-
50+
brew install llvm@16
51+
echo "export CC=/opt/homebrew/opt/llvm@16/bin/clang" >> /Users/runner/.bashrc
52+
echo "export CXX=/opt/homebrew/opt/llvm@16/bin/clang++" >> /Users/runner/.bashrc
53+
4654
- if: "matrix.os == 'ubuntu-20.04'"
4755
name: "Install gcc-10 (for c++20)"
4856
run: |-
@@ -54,12 +62,8 @@ jobs:
5462
sudo ln --symbolic --force /usr/bin/g++-10 /usr/bin/c++
5563
sudo ln --symbolic --force /usr/bin/cpp-10 /usr/bin/cpp
5664
57-
- name: "Log tool versions"
58-
run: |-
59-
command -v md5sum
60-
command -v python
61-
command -v tar
62-
command -v task
63-
6465
- name: "Run unit tests"
65-
run: "task test-all"
66+
run: |-
67+
source ~/.bashrc
68+
task clean
69+
task test-all

0 commit comments

Comments
 (0)