Skip to content

Commit 41a2353

Browse files
authored
Merge pull request #232 from aminya/macos
2 parents 88ef2fc + ea2732f commit 41a2353

Some content is hidden

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

41 files changed

+1016
-733
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ jobs:
146146
- windows-2019
147147
- ubuntu-22.04
148148
- ubuntu-20.04
149+
- macos-13
149150
- macos-12
150151
- macos-11
151152
node:

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), Linux (Ubuntu 22.04, Ubuntu 20.04, Fedora, ArchLinux), and macOS (12, 11, 10.15). `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), Linux (Ubuntu 22.04, Ubuntu 20.04, Fedora, ArchLinux), and macOS (13, 12, 11, 10.15). `setup-cpp` is backed by unit tests for each tool and integration tests for compiling cpp projects.
1212

1313
## Features
1414

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ inputs:
9090
required: false
9191

9292
runs:
93-
using: "node16"
93+
using: "node20"
9494
main: "dist/actions/setup-cpp.js"
9595

9696
branding:

dist/actions/actions_python.10530df8.js

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

dist/actions/actions_python.10530df8.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/actions/actions_python.bfd29453.js

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

dist/actions/actions_python.bfd29453.js.map

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

dist/actions/hdi.89f0ed6f.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/actions/hdi.89f0ed6f.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/actions/setup-cpp.js

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

dist/actions/setup-cpp.js.map

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

dist/legacy/actions_python.7877377d.js

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

dist/legacy/actions_python.7877377d.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/actions_python.c7411d6b.js

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

dist/legacy/actions_python.c7411d6b.js.map

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

dist/legacy/hdi.069dd8f5.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/hdi.069dd8f5.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/setup-cpp.js

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

dist/legacy/setup-cpp.js.map

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

dist/modern/actions_python.4fb6b558.js

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

dist/modern/actions_python.4fb6b558.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/modern/actions_python.6be0dfa4.js

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

dist/modern/actions_python.6be0dfa4.js.map

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

dist/modern/hdi.9d60a332.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/modern/hdi.9d60a332.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/modern/setup-cpp.js

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

dist/modern/setup-cpp.js.map

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

package.json

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"build": "run-s clean build.packages && run-p lint.tsc build.parcel copy.matchers",
3232
"build.packages": "pnpm run -r build",
3333
"build.parcel": "cross-env NODE_ENV=production parcel build && babel ./dist --out-dir dist --plugins @upleveled/babel-plugin-remove-node-prefix --compact --no-babelrc --source-maps true",
34-
"bump": "ncu -u -x numerous,execa,prettier && pnpm update",
34+
"bump": "ncu -u -x numerous,execa,prettier,@types/node && pnpm update",
3535
"clean": "shx rm -rf ./dist ./exe ./packages/*/dist/ && shx mkdir -p ./dist/legacy ./dist/actions ./dist/modern ",
3636
"copy.matchers": "run-p copy.matchers.legacy copy.matchers.actions copy.matchers.modern",
3737
"copy.matchers.legacy": "shx cp ./src/gcc/gcc_matcher.json ./dist/legacy/ && shx cp ./src/msvc/msvc_matcher.json ./dist/legacy/ && shx cp ./src/python/python_matcher.json ./dist/legacy/ && shx cp ./src/llvm/llvm_matcher.json ./dist/legacy/",
@@ -75,15 +75,16 @@
7575
"@actions/exec": "^1.1.1",
7676
"@actions/io": "^1.1.3",
7777
"@actions/tool-cache": "^2.0.1",
78-
"@babel/cli": "^7.23.4",
79-
"@swc/jest": "^0.2.31",
78+
"@babel/cli": "^7.23.9",
79+
"@shockpkg/archive-files": "https://github.com/aminya/archive-files#54ec59fad46aca736ac6feb6c7bb526528141b9d",
80+
"@swc/jest": "^0.2.36",
8081
"@types/cross-spawn": "^6.0.6",
8182
"@types/eslint": "^8.56.2",
82-
"@types/jest": "^29.5.11",
83+
"@types/jest": "^29.5.12",
8384
"@types/mri": "^1.1.5",
84-
"@types/node": "^20.11.5",
85+
"@types/node": "^12",
8586
"@types/prettier": "2.7.3",
86-
"@types/semver": "^7.5.6",
87+
"@types/semver": "^7.5.7",
8788
"@types/which": "^3.0.3",
8889
"@upleveled/babel-plugin-remove-node-prefix": "github:aminya/babel-plugin-remove-node-prefix#95fcbd92405b99a6eece48c493548996f12e6519",
8990
"admina": "^1.0.1",
@@ -102,12 +103,13 @@
102103
"execa": "^7.2.0",
103104
"is-url-online": "^1.5.0",
104105
"jest": "^29.7.0",
106+
"macos-release": "^3.2.0",
105107
"micro-memoize": "^4.1.2",
106108
"mkdirp": "^3.0.1",
107109
"mri": "^1.2.0",
108110
"msvc-dev-cmd": "github:aminya/msvc-dev-cmd#97843d525947e3f3776ee359b597316909754c4d",
109-
"npm-check-updates": "^16.14.12",
110-
"npm-run-all2": "^6.1.1",
111+
"npm-check-updates": "^16.14.15",
112+
"npm-run-all2": "^6.1.2",
111113
"numerous": "1.0.3",
112114
"p-timeout": "^6.1.2",
113115
"parcel": "2.11.0",
@@ -117,7 +119,7 @@
117119
"prettier-config-atomic": "^4.0.0",
118120
"readme-md-generator": "^1.0.0",
119121
"retry-as-promised": "^7.0.4",
120-
"semver": "7.5.4",
122+
"semver": "7.6.0",
121123
"setup-python": "github:aminya/setup-python#a783db655c6e40317e2c0c96f9d162d9c9f4a751",
122124
"shx": "0.3.4",
123125
"simple-update-notifier": "^2.0.0",
@@ -184,12 +186,8 @@
184186
"electron": false,
185187
"patha": "patha/dist/index.node.mjs",
186188
"admina": "admina/dist/index.mjs",
187-
"fs/promises": "./src/utils/compat/fs/promises.ts"
188-
},
189-
"pnpm": {
190-
"overrides": {
191-
"@actions/http-client": "2.1.0"
192-
}
189+
"fs/promises": "./src/utils/compat/fs/promises.ts",
190+
"stream/promises": "./src/utils/compat/stream/promises.ts"
193191
},
194192
"targets": {
195193
"main": {
@@ -206,7 +204,7 @@
206204
"actions": {
207205
"context": "node",
208206
"engines": {
209-
"node": ">=16.x"
207+
"node": ">=20.x"
210208
},
211209
"includeNodeModules": {
212210
"update-notifier": false

0 commit comments

Comments
 (0)