Skip to content

Commit ef74ed3

Browse files
authored
Merge pull request #324 from aminya/update-cmake [skip ci]
fix: update LLVM to 19 + update cmake, meson, task, mingw + feat: support Windows arm cross-compilation + test on MacOS 15
2 parents 9eae7b8 + 6b8e64c commit ef74ed3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+2073
-1562
lines changed

.github/workflows/CI.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ jobs:
8282
fail-fast: false
8383
matrix:
8484
os:
85-
- windows-2022
86-
- ubuntu-24.04
87-
- macos-13
85+
- windows-2019
86+
- ubuntu-20.04
87+
- macos-13 # x64
8888
- macos-14 # arm64
8989
steps:
9090
- uses: actions/checkout@v4
@@ -143,9 +143,12 @@ jobs:
143143
- ubuntu-24.04
144144
- ubuntu-22.04
145145
- ubuntu-20.04
146-
- macos-14
147-
- macos-13
148-
- macos-12
146+
- macos-15 # arm64
147+
# - macos-15-large # x64
148+
- macos-14 # arm64
149+
# - macos-14-large # x64
150+
# - macos-14-xlarge #arm64
151+
- macos-13 # x64
149152
steps:
150153
- uses: actions/checkout@v4
151154
with:
@@ -202,7 +205,7 @@ jobs:
202205
RUNNER_OS_NAME: ${{ matrix.os }}
203206

204207
- name: Setup Node 12
205-
if: ${{ !contains(matrix.os, 'macos-14') }}
208+
if: ${{ !contains(matrix.os, 'macos-14') && !contains(matrix.os, 'macos-15') }}
206209
uses: actions/setup-node@v4
207210
with:
208211
node-version: 12

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Setting up a **cross-platform** environment for building and testing C++/C proje
88

99
`setup-cpp` can be used locally from terminal, from CI services like GitHub Actions and GitLab Pipelines, and inside containers like Docker.
1010

11-
`setup-cpp` is supported on many platforms. It is continuously tested on several configurations including Windows (11, 10, 2022, 2019) x64/ARM/x86, Linux (Ubuntu 24.0, 22.04, 20.04, 18.04, Fedora, ArchLinux) x64/ARM, and macOS (14, 13, 12, 11, 10.15) x64/ARM. `setup-cpp` is backed by unit tests for each tool and integration tests for compiling cpp projects.
11+
`setup-cpp` is supported on many platforms. It is continuously tested on several configurations including Windows (11, 10, 2022, 2019) x64/ARM/x86, Linux (Ubuntu 24.0, 22.04, 20.04, 18.04, Fedora, ArchLinux) x64/ARM, and macOS (15, 14, 13, 12, 11, 10.15) x64/ARM. `setup-cpp` is backed by unit tests for each tool and integration tests for compiling cpp projects.
1212

1313
## Features
1414

cspell.config.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ words:
9797
- Sccache
9898
- setupcpp
9999
- setx
100+
- sparcv
100101
- SYSROOT
101102
- Syuu
102103
- terserrc
@@ -117,6 +118,7 @@ words:
117118
- vsversion
118119
- whatwg
119120
- xcrun
121+
- xlarge
120122
- Yahyaabadi
121123
ignoreWords: []
122124
import: []

dev/scripts/pack-exe.mjs

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,29 +15,18 @@ function getPlatformName() {
1515
}
1616
}
1717

18-
function main() {
19-
let exes
20-
if (process.platform === "win32") {
21-
exes = [".exe"]
22-
} else if (process.platform === "darwin") {
23-
exes = [""]
24-
} else {
25-
exes = [""]
26-
}
18+
async function main() {
19+
const exe = process.platform === "win32" ? ".exe" : ""
2720

28-
return Promise.all(
29-
exes.map((exe) =>
30-
execaNode("./node_modules/caxa/build/index.mjs", [
31-
"--input",
32-
"./dist/modern",
33-
"--output",
34-
`./exe/setup-cpp-${process.arch}-${getPlatformName()}${exe}`,
35-
"--",
36-
`{{caxa}}/node_modules/.bin/node${exe}`,
37-
"{{caxa}}/setup-cpp.mjs",
38-
])
39-
),
40-
)
21+
await execaNode("./node_modules/caxa/build/index.mjs", [
22+
"--input",
23+
"./dist/modern",
24+
"--output",
25+
`./exe/setup-cpp-${process.arch}-${getPlatformName()}${exe}`,
26+
"--",
27+
`{{caxa}}/node_modules/.bin/node${exe}`,
28+
"{{caxa}}/setup-cpp.mjs",
29+
])
4130
}
4231

4332
main().catch((err) => {

dist/legacy/assets/actions_python-Czj4ScEf.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/assets/actions_python-Czj4ScEf.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/legacy/assets/actions_python-juFJ8Ha1.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

dist/legacy/assets/actions_python-juFJ8Ha1.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dist/legacy/assets/hdi-Bqz5zNw7.js

Lines changed: 0 additions & 2 deletions
This file was deleted.

dist/legacy/assets/hdi-Bqz5zNw7.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)