Skip to content

Commit a91fdca

Browse files
authored
Merge pull request #284 from aminya/assets [skip ci]
2 parents cb3bbf1 + d54a821 commit a91fdca

13 files changed

+717
-145
lines changed

dist/legacy/gcc_matcher.json

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
{
2-
"problemMatcher": [
3-
{
4-
"owner": "gcc",
5-
"pattern": [
6-
{
7-
"regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
8-
"file": 1,
9-
"line": 2,
10-
"column": 3,
11-
"severity": 4,
12-
"message": 5
13-
}
14-
]
15-
}
16-
]
17-
}
1+
{"problemMatcher":[{"owner":"gcc","pattern":[{"regexp":"^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$","file":1,"line":2,"column":3,"severity":4,"message":5}]}]}

dist/legacy/llvm_matcher.json

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
{
2-
"problemMatcher": [
3-
{
4-
"owner": "llvm",
5-
"pattern": [
6-
{
7-
"regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
8-
"file": 1,
9-
"line": 2,
10-
"column": 3,
11-
"severity": 4,
12-
"message": 5
13-
}
14-
]
15-
}
16-
]
17-
}
1+
{"problemMatcher":[{"owner":"llvm","pattern":[{"regexp":"^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$","file":1,"line":2,"column":3,"severity":4,"message":5}]}]}

dist/legacy/msvc_matcher.json

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1 @@
1-
{
2-
"problemMatcher": [
3-
{
4-
"owner": "msvc",
5-
"pattern": [
6-
{
7-
"regexp": "^(?:\\s+\\d+>)?(\\S.*)\\((\\d+),?(\\d+)?(?:,\\d+,\\d+)?\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
8-
"file": 1,
9-
"line": 2,
10-
"column": 3,
11-
"severity": 4,
12-
"code": 5,
13-
"message": 6
14-
}
15-
]
16-
}
17-
]
18-
}
1+
{"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}]}]}

dist/legacy/python_matcher.json

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1 @@
1-
{
2-
"problemMatcher": [
3-
{
4-
"owner": "python",
5-
"pattern": [
6-
{
7-
"regexp": "^\\s*File\\s\\\"(.*)\\\",\\sline\\s(\\d+),\\sin\\s(.*)$",
8-
"file": 1,
9-
"line": 2
10-
},
11-
{
12-
"regexp": "^\\s*raise\\s(.*)\\(\\'(.*)\\'\\)$",
13-
"message": 2
14-
}
15-
]
16-
}
17-
]
18-
}
1+
{"problemMatcher":[{"owner":"python","pattern":[{"regexp":"^\\s*File\\s\\\"(.*)\\\",\\sline\\s(\\d+),\\sin\\s(.*)$","file":1,"line":2},{"regexp":"^\\s*raise\\s(.*)\\(\\'(.*)\\'\\)$","message":2}]}]}

dist/modern/gcc_matcher.json

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
{
2-
"problemMatcher": [
3-
{
4-
"owner": "gcc",
5-
"pattern": [
6-
{
7-
"regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
8-
"file": 1,
9-
"line": 2,
10-
"column": 3,
11-
"severity": 4,
12-
"message": 5
13-
}
14-
]
15-
}
16-
]
17-
}
1+
{"problemMatcher":[{"owner":"gcc","pattern":[{"regexp":"^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$","file":1,"line":2,"column":3,"severity":4,"message":5}]}]}

dist/modern/llvm_matcher.json

+1-17
Original file line numberDiff line numberDiff line change
@@ -1,17 +1 @@
1-
{
2-
"problemMatcher": [
3-
{
4-
"owner": "llvm",
5-
"pattern": [
6-
{
7-
"regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
8-
"file": 1,
9-
"line": 2,
10-
"column": 3,
11-
"severity": 4,
12-
"message": 5
13-
}
14-
]
15-
}
16-
]
17-
}
1+
{"problemMatcher":[{"owner":"llvm","pattern":[{"regexp":"^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$","file":1,"line":2,"column":3,"severity":4,"message":5}]}]}

dist/modern/msvc_matcher.json

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1 @@
1-
{
2-
"problemMatcher": [
3-
{
4-
"owner": "msvc",
5-
"pattern": [
6-
{
7-
"regexp": "^(?:\\s+\\d+>)?(\\S.*)\\((\\d+),?(\\d+)?(?:,\\d+,\\d+)?\\)\\s*:\\s+(error|warning|info)\\s+(\\w{1,2}\\d+)\\s*:\\s*(.*)$",
8-
"file": 1,
9-
"line": 2,
10-
"column": 3,
11-
"severity": 4,
12-
"code": 5,
13-
"message": 6
14-
}
15-
]
16-
}
17-
]
18-
}
1+
{"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}]}]}

dist/modern/python_matcher.json

+1-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1 @@
1-
{
2-
"problemMatcher": [
3-
{
4-
"owner": "python",
5-
"pattern": [
6-
{
7-
"regexp": "^\\s*File\\s\\\"(.*)\\\",\\sline\\s(\\d+),\\sin\\s(.*)$",
8-
"file": 1,
9-
"line": 2
10-
},
11-
{
12-
"regexp": "^\\s*raise\\s(.*)\\(\\'(.*)\\'\\)$",
13-
"message": 2
14-
}
15-
]
16-
}
17-
]
18-
}
1+
{"problemMatcher":[{"owner":"python","pattern":[{"regexp":"^\\s*File\\s\\\"(.*)\\\",\\sline\\s(\\d+),\\sin\\s(.*)$","file":1,"line":2},{"regexp":"^\\s*raise\\s(.*)\\(\\'(.*)\\'\\)$","message":2}]}]}

dprint.json

-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"./.cache/",
3838
"**/build",
3939
"**/dist",
40-
"**/github_brechtsanders_winlibs_mingw.json",
4140
"dev/cpp_vcpkg_project"
4241
],
4342
"plugins": [

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
"tsconfig.json"
2727
],
2828
"scripts": {
29-
"build": "turbo build && run-p lint.root.tsc build.vite build.vite.legacy && run-p copy.json",
29+
"build": "turbo build && run-p lint.root.tsc build.vite build.vite.legacy && run-s build.json",
3030
"build.vite": "cross-env NODE_ENV=production vite build",
3131
"build.vite.legacy": "cross-env NODE_ENV=production TARGET=legacy vite build",
32+
"build.json": "shx cp ./src/*/*.json ./dist/legacy/ && shx cp ./dist/legacy/*.json ./dist/modern && minijson --file ./dist/**/*.json",
3233
"bump": "ncu -u -x numerous,execa,prettier,@types/node,eslint,@types/eslint && pnpm update && pnpx typesync && pnpm run clean",
3334
"clean": "shx rm -rf ./dist ./packages/*/dist ./exe ./.parcel-cache && shx mkdir -p ./dist/legacy ./dist/modern ./dist/modern ",
34-
"copy.json": "shx cp ./src/*/*.json ./dist/legacy/ && shx cp ./dist/legacy/*.json ./dist/modern",
3535
"dev.vite": "cross-env NODE_ENV=development vite build --watch",
3636
"dev.packages": "turbo dev",
3737
"dev": "run-p dev.packages dev.vite",
@@ -59,6 +59,7 @@
5959
"@actions/http-client": "^2.2.3",
6060
"@actions/io": "^1.1.3",
6161
"@actions/tool-cache": "^2.0.1",
62+
"@aminya/minijson": "1.0.3",
6263
"@babel/core": "^7.25.2",
6364
"@biomejs/biome": "^1.8.3",
6465
"@iarna/toml": "^2.2.5",

pnpm-lock.yaml

+17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/gcc/github_brechtsanders_winlibs_mingw.json

+688-1
Large diffs are not rendered by default.

src/utils/github/fetch-assets.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export async function saveGitHubAssetList(
8383
const jsonStringify = JsonStringify.configure({
8484
deterministic: compareVersion,
8585
})
86-
const data = jsonStringify(assets)
86+
const data = jsonStringify(assets, null, 2)
8787

8888
// write the assets to a json file
8989
await writeFile(path, data)

0 commit comments

Comments
 (0)