mirror of https://github.com/aminya/setup-cpp
feat: add node16 target and use it in the exe and on github
This commit is contained in:
parent
9d1119edc9
commit
c82db22da1
|
@ -80,8 +80,8 @@ inputs:
|
|||
required: false
|
||||
|
||||
runs:
|
||||
using: "node12"
|
||||
main: "dist/setup_cpp.js"
|
||||
using: "node16"
|
||||
main: "dist/node16/setup_cpp.js"
|
||||
|
||||
branding:
|
||||
icon: "award"
|
||||
|
|
|
@ -11,7 +11,7 @@ RUN pacman -S --noconfirm --needed nodejs
|
|||
RUN pacman -S --noconfirm --needed curl
|
||||
|
||||
# add setup_cpp.js
|
||||
COPY "./dist/" "/"
|
||||
COPY "./dist/node12" "/"
|
||||
WORKDIR "/"
|
||||
|
||||
# run installation
|
||||
|
|
|
@ -8,7 +8,7 @@ RUN dnf -y install nodejs
|
|||
RUN dnf -y install curl
|
||||
|
||||
# add setup_cpp.js
|
||||
COPY "./dist/" "/"
|
||||
COPY "./dist/node12" "/"
|
||||
WORKDIR "/"
|
||||
|
||||
# run installation
|
||||
|
|
|
@ -12,7 +12,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -
|
|||
RUN apt-get install -y --no-install-recommends nodejs
|
||||
|
||||
# add setup_cpp.js
|
||||
ADD "./dist/" "/"
|
||||
COPY "./dist/node12" "/"
|
||||
WORKDIR "/"
|
||||
|
||||
# run installation
|
||||
|
|
|
@ -4,7 +4,7 @@ RUN apt-get update -qq
|
|||
RUN apt-get install -y --no-install-recommends nodejs
|
||||
|
||||
# add setup_cpp.js
|
||||
COPY "./dist/" "/"
|
||||
COPY "./dist/node12" "/"
|
||||
WORKDIR "/"
|
||||
|
||||
# run installation
|
||||
|
|
|
@ -27,7 +27,7 @@ function main() {
|
|||
return Promise.all(
|
||||
exes.map((exe) =>
|
||||
exec(
|
||||
`./node_modules/.bin/caxa --input ./dist --output ./exe/setup_cpp_${getPlatformName()}${exe} -- "{{caxa}}/node_modules/.bin/node${exe}" "{{caxa}}/setup_cpp.js"`
|
||||
`./node_modules/.bin/caxa --input ./dist/node16 --output ./exe/setup_cpp_${getPlatformName()}${exe} -- "{{caxa}}/node_modules/.bin/node${exe}" "{{caxa}}/setup_cpp.js"`
|
||||
)
|
||||
)
|
||||
)
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
"problemMatcher": [
|
||||
{
|
||||
"owner": "gcc",
|
||||
"pattern": [
|
||||
{
|
||||
"regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
|
||||
"file": 1,
|
||||
"line": 2,
|
||||
"column": 3,
|
||||
"severity": 4,
|
||||
"message": 5
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,17 @@
|
|||
{
|
||||
"problemMatcher": [
|
||||
{
|
||||
"owner": "llvm",
|
||||
"pattern": [
|
||||
{
|
||||
"regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
|
||||
"file": 1,
|
||||
"line": 2,
|
||||
"column": 3,
|
||||
"severity": 4,
|
||||
"message": 5
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"problemMatcher": [
|
||||
{
|
||||
"owner": "msvc",
|
||||
"pattern": [
|
||||
{
|
||||
"regexp": "^(?:\\s+\\d+>)?(\\S.*)\\((\\d+),?(\\d+)?(?:,\\d+,\\d+)?\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
|
||||
"file": 1,
|
||||
"line": 2,
|
||||
"column": 3,
|
||||
"severity": 4,
|
||||
"code": 5,
|
||||
"message": 6
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"problemMatcher": [
|
||||
{
|
||||
"owner": "python",
|
||||
"pattern": [
|
||||
{
|
||||
"regexp": "^\\s*File\\s\\\"(.*)\\\",\\sline\\s(\\d+),\\sin\\s(.*)$",
|
||||
"file": 1,
|
||||
"line": 2
|
||||
},
|
||||
{
|
||||
"regexp": "^\\s*raise\\s(.*)\\(\\'(.*)\\'\\)$",
|
||||
"message": 2
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
24
package.json
24
package.json
|
@ -6,17 +6,17 @@
|
|||
"license": "Apache-2.0",
|
||||
"author": "Amin Yahyaabadi",
|
||||
"exports": {
|
||||
"import": "./dist/setup-cpp.mjs",
|
||||
"require": "./dist/setup-cpp.js"
|
||||
"import": "./dist/node12/setup-cpp.mjs",
|
||||
"require": "./dist/node12/setup-cpp.js"
|
||||
},
|
||||
"main": "./dist/setup_cpp.js",
|
||||
"main": "./dist/node12/setup_cpp.js",
|
||||
"source": "./src/main.ts",
|
||||
"bin": {
|
||||
"setup-cpp": "./dist/setup_cpp.js",
|
||||
"setup_cpp": "./dist/setup_cpp.js"
|
||||
"setup-cpp": "./dist/node12/setup_cpp.js",
|
||||
"setup_cpp": "./dist/node12/setup_cpp.js"
|
||||
},
|
||||
"scripts": {
|
||||
"build": "shx rm -rf dist/ && shx mkdir ./dist && run-p lint.tsc build.parcel copy.matchers",
|
||||
"build": "shx rm -rf dist/ && shx mkdir -p ./dist/node12 ./dist/node16 && run-p lint.tsc build.parcel copy.matchers",
|
||||
"build.docker": "pnpm build && docker build -f ./dev/docker/ubuntu_node.dockerfile -t setup_cpp .",
|
||||
"build.docker.arch": "pnpm build && docker build -f ./dev/docker/arch_node.dockerfile -t setup_cpp:arch .",
|
||||
"build.docker.fedora": "pnpm build && docker build -f ./dev/docker/fedora_node.dockerfile -t setup_cpp:fedora .",
|
||||
|
@ -24,7 +24,7 @@
|
|||
"build.parcel": "cross-env NODE_ENV=production parcel build --detailed-report",
|
||||
"bump": "ncu -u -x execa,numerous && pnpm update",
|
||||
"clean": "shx rm -rf .parcel-cache dist exe",
|
||||
"copy.matchers": "shx cp ./src/gcc/gcc_matcher.json ./dist/ && shx cp ./src/msvc/msvc_matcher.json ./dist && shx cp ./src/python/python_matcher.json ./dist/ && shx cp ./src/llvm/llvm_matcher.json ./dist/ ",
|
||||
"copy.matchers": "shx cp ./src/gcc/gcc_matcher.json ./dist/node12/ && shx cp ./src/msvc/msvc_matcher.json ./dist/node12/ && shx cp ./src/python/python_matcher.json ./dist/node12/ && shx cp ./src/llvm/llvm_matcher.json ./dist/node12/ && shx cp ./dist/node12/*.json ./dist/node16/",
|
||||
"dev": "cross-env NODE_ENV=development parcel watch",
|
||||
"docs": "shx rm -rf packages/*/README.md && pnpm -r exec readme --path ../../dev/readme/template.md -y && pnpm -r exec ts-readme",
|
||||
"format": "run-s lint.prettier",
|
||||
|
@ -127,6 +127,7 @@
|
|||
"electron": false,
|
||||
"patha": "patha/dist/index.node.mjs"
|
||||
},
|
||||
"main.actions": "./dist/node16/setup_cpp.js",
|
||||
"pnpm": {
|
||||
"overrides": {
|
||||
"semver": "7.3.8",
|
||||
|
@ -151,6 +152,15 @@
|
|||
"includeNodeModules": true,
|
||||
"optimize": true,
|
||||
"outputFormat": "commonjs"
|
||||
},
|
||||
"main.actions": {
|
||||
"context": "node",
|
||||
"engines": {
|
||||
"node": ">=16.x"
|
||||
},
|
||||
"includeNodeModules": true,
|
||||
"optimize": true,
|
||||
"outputFormat": "commonjs"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue