Skip to content

Commit af76d3a

Browse files
ilg-ulilg-ul
committed
re-generate top commons
1 parent edb7d91 commit af76d3a

File tree

6 files changed

+86
-26
lines changed

6 files changed

+86
-26
lines changed

‎.github/workflows/build-win32-x64.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,26 @@ jobs:
174174
ref: ${{github.event.inputs.helper-git-ref}}
175175
fetch-depth: 3
176176

177+
- name: 'Move workspace to short path for MinGW compatibility'
178+
run: |
179+
echo Creating D:\t short name folder...
180+
mkdir D:\t
181+
182+
echo Moving workspace to D:\t...
183+
robocopy "%GITHUB_WORKSPACE%" "D:\t" /E /MOVE /NFL /NDL /NJH /NJS /NC /NS
184+
185+
if %ERRORLEVEL% LEQ 3 (
186+
echo ✓ Workspace successfully moved to D:\t
187+
dir D:\t
188+
) else (
189+
echo ✗ Failed to move workspace, robocopy exit code: %ERRORLEVEL%
190+
exit /b 1
191+
)
192+
shell: cmd
193+
177194
- name: 'Run ${{github.event.inputs.version}} native test'
195+
working-directory: D:\t
196+
# Run the test from the short path
178197
run: bash build-assets/scripts/test.sh --version ${{github.event.inputs.version}} --base-url pre-release
179198

180199
- name: Upload platform tests report

‎.github/workflows/test-prime.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,26 @@ jobs:
8383
ref: ${{github.event.inputs.helper-git-ref}}
8484
fetch-depth: 3
8585

86+
- name: 'Move workspace to short path for MinGW compatibility'
87+
run: |
88+
echo Creating D:\t short name folder...
89+
mkdir D:\t
90+
91+
echo Moving workspace to D:\t...
92+
robocopy "%GITHUB_WORKSPACE%" "D:\t" /E /MOVE /NFL /NDL /NJH /NJS /NC /NS
93+
94+
if %ERRORLEVEL% LEQ 3 (
95+
echo ✓ Workspace successfully moved to D:\t
96+
dir D:\t
97+
) else (
98+
echo ✗ Failed to move workspace, robocopy exit code: %ERRORLEVEL%
99+
exit /b 1
100+
)
101+
shell: cmd
102+
86103
- name: 'Run ${{github.event.inputs.version}} native test'
104+
working-directory: D:\t
105+
# Run the test from the short path
87106
run: bash build-assets/scripts/test.sh --version ${{github.event.inputs.version}} --base-url ${{github.event.inputs.base_url}}
88107

89108

‎.github/workflows/test-xpm.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,26 @@ jobs:
8383
ref: ${{github.event.inputs.helper-git-ref}}
8484
fetch-depth: 3
8585

86+
- name: 'Move workspace to short path for MinGW compatibility'
87+
run: |
88+
echo Creating D:\t short name folder...
89+
mkdir D:\t
90+
91+
echo Moving workspace to D:\t...
92+
robocopy "%GITHUB_WORKSPACE%" "D:\t" /E /MOVE /NFL /NDL /NJH /NJS /NC /NS
93+
94+
if %ERRORLEVEL% LEQ 3 (
95+
echo ✓ Workspace successfully moved to D:\t
96+
dir D:\t
97+
) else (
98+
echo ✗ Failed to move workspace, robocopy exit code: %ERRORLEVEL%
99+
exit /b 1
100+
)
101+
shell: cmd
102+
86103
- name: 'Run ${{github.event.inputs.version}} xpm test'
104+
working-directory: D:\t
105+
# Run the test from the short path
87106
run: bash build-assets/scripts/test.sh --package-version ${{github.event.inputs.package-version}} --version ${{github.event.inputs.version}} --xpm
88107

89108

‎build-assets/package.json‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,25 @@
22
"name": "build-assets",
33
"version": "0.0.0",
44
"private": true,
5-
"scripts": {},
5+
"scripts": {
6+
"deep-clean": "del-cli node_modules package-lock.json",
7+
"npm-install": "npm install",
8+
"npm-outdated": "npm outdated",
9+
"git-log": "git -C .. log --pretty='%cd * %h %s' --date=short",
10+
"git-pull-helper": "git -C ${HOME}/Work/xpack-dev-tools/xbb-helper-xpack.git pull"
11+
},
612
"bundleDependencies": [],
713
"$devDependenciesUrls": [
814
"https://www.npmjs.com/package/liquidjs"
915
],
1016
"devDependencies": {
11-
"liquidjs": "^10.20.1"
17+
"del-cli": "^7.0.0",
18+
"liquidjs": "^10.23.0"
1219
},
1320
"xpack": {
1421
"minimumXpmRequired": "0.20.5",
1522
"devDependencies": {
16-
"@xpack-dev-tools/xbb-helper": "github:xpack-dev-tools/xbb-helper-xpack#v4.3.13"
23+
"@xpack-dev-tools/xbb-helper": "github:xpack-dev-tools/xbb-helper-xpack#v4.3.15"
1724
},
1825
"properties": {
1926
"platforms": "all",
@@ -26,8 +33,8 @@
2633
},
2734
"actions": {
2835
"deep-clean": [
29-
"rm -rf build xpacks node_modules package-lock.json",
30-
"rm -rf ${HOME}/Work/xpack-dev-tools-build/mingw-w64-gcc-[0-9]*-*"
36+
"del-cli build xpacks node_modules package-lock.json",
37+
"del-cli --force ${HOME}/Work/xpack-dev-tools-build/mingw-w64-gcc-[0-9]*-*"
3138
],
3239
"install": [
3340
"npm install",
@@ -36,17 +43,13 @@
3643
"link-deps": [
3744
"xpm link @xpack-dev-tools/xbb-helper"
3845
],
39-
"git-pull-helper": [
40-
"git -C ${HOME}/Work/xpack-dev-tools/xbb-helper-xpack.git pull"
41-
],
42-
"git-log": "git -C .. log --pretty='%cd * %h %s' --date=short",
4346
"check-space": "{% if os.platform == 'darwin' %}df -gH /{% else %}df -BG -H /{% endif %}",
44-
"clear-all-projects-builds": "rm -rf ~/Work/xpack-dev-tools/*/build-assets/build",
47+
"clear-all-projects-builds": "del-cli --force ~/Work/xpack-dev-tools/*/build-assets/build",
4548
"trigger-workflow-build-darwin-x64": "bash xpacks/@xpack-dev-tools/xbb-helper/github-actions/trigger-workflow-build.sh --workflow build-darwin-x64.yml --xpm-version {{properties.xpm-version}} --loglevel {{properties.xpm-install-loglevel}}",
4649
"trigger-workflow-build-darwin-arm64": "bash xpacks/@xpack-dev-tools/xbb-helper/github-actions/trigger-workflow-build.sh --workflow build-darwin-arm64.yml --xpm-version {{properties.xpm-version}} --loglevel {{properties.xpm-install-loglevel}}",
4750
"trigger-workflow-build-linux-x64": "bash xpacks/@xpack-dev-tools/xbb-helper/github-actions/trigger-workflow-build.sh --workflow build-linux-x64.yml --xpm-version {{properties.xpm-version}} --loglevel {{properties.xpm-install-loglevel}}",
48-
"trigger-workflow-build-win32-x64": "bash xpacks/@xpack-dev-tools/xbb-helper/github-actions/trigger-workflow-build.sh --workflow build-win32-x64.yml --xpm-version {{properties.xpm-version}} --loglevel {{properties.xpm-install-loglevel}}",
4951
"trigger-workflow-build-linux-arm64": "bash xpacks/@xpack-dev-tools/xbb-helper/github-actions/trigger-workflow-build.sh --workflow build-linux-arm64.yml --xpm-version {{properties.xpm-version}} --loglevel {{properties.xpm-install-loglevel}}",
52+
"trigger-workflow-build-win32-x64": "bash xpacks/@xpack-dev-tools/xbb-helper/github-actions/trigger-workflow-build.sh --workflow build-win32-x64.yml --xpm-version {{properties.xpm-version}} --loglevel {{properties.xpm-install-loglevel}}",
5053
"trigger-workflow-test-prime": "bash xpacks/@xpack-dev-tools/xbb-helper/github-actions/trigger-workflow-test-prime.sh",
5154
"trigger-workflow-test-docker-linux-x64": "bash xpacks/@xpack-dev-tools/xbb-helper/github-actions/trigger-workflow-test-docker-linux-x64.sh",
5255
"trigger-workflow-test-docker-linux-arm64": "bash xpacks/@xpack-dev-tools/xbb-helper/github-actions/trigger-workflow-test-docker-linux-arm.sh",
@@ -70,19 +73,19 @@
7073
"hidden": true,
7174
"devDependencies": {
7275
"@xpack-dev-tools/bison": "3.8.2-1.1",
73-
"@xpack-dev-tools/cmake": "3.30.7-1.1",
76+
"@xpack-dev-tools/cmake": "3.31.9-1.1",
7477
"@xpack-dev-tools/flex": "2.6.4-1.1",
75-
"@xpack-dev-tools/m4": "1.4.19-3.1",
76-
"@xpack-dev-tools/ninja-build": "1.12.1-1.1",
78+
"@xpack-dev-tools/m4": "1.4.20-1.1",
79+
"@xpack-dev-tools/ninja-build": "1.13.1-1.1",
7780
"@xpack-dev-tools/pkg-config": "0.29.2-3.1"
7881
}
7982
},
8083
"common-actions": {
8184
"hidden": true,
8285
"actions": {
8386
"deep-clean": [
84-
"rm -rf {{properties.buildFolderRelativePathPosix}}",
85-
"rm -rf ${HOME}/Work/xpack-dev-tools-build/mingw-w64-gcc-[0-9]*-*/{{configuration.name}}"
87+
"del-cli {{properties.buildFolderRelativePathPosix}}",
88+
"del-cli --force ${HOME}/Work/xpack-dev-tools-build/mingw-w64-gcc-[0-9]*-*/{{configuration.name}}"
8689
],
8790
"install": "xpm install --config {{configuration.name}}"
8891
}
@@ -148,8 +151,8 @@
148151
"common-actions-native"
149152
],
150153
"devDependencies": {
151-
"@xpack-dev-tools/clang": "19.1.7-1.1",
152-
"@xpack-dev-tools/realpath": "9.5.0-1.1",
154+
"@xpack-dev-tools/clang": "20.1.8-1.1",
155+
"@xpack-dev-tools/realpath": "9.8.0-1.1",
153156
"@xpack-dev-tools/sed": "4.9.0-3.1"
154157
},
155158
"actions": {
@@ -172,7 +175,7 @@
172175
"common-docker"
173176
],
174177
"devDependencies": {
175-
"@xpack-dev-tools/gcc": "14.2.0-2.1",
178+
"@xpack-dev-tools/gcc": "15.2.0-1.1",
176179
"@xpack-dev-tools/patchelf": "0.18.0-1.1"
177180
},
178181
"properties": {
@@ -203,8 +206,8 @@
203206
"common-docker"
204207
],
205208
"devDependencies": {
206-
"@xpack-dev-tools/gcc": "14.2.0-2.1",
207-
"@xpack-dev-tools/mingw-w64-gcc": "14.2.0-1.1",
209+
"@xpack-dev-tools/gcc": "15.2.0-1.1",
210+
"@xpack-dev-tools/mingw-w64-gcc": "15.2.0-2.1",
208211
"@xpack-dev-tools/wine": "10.0.0-1.1"
209212
},
210213
"properties": {

‎package-lock.json‎

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

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
"devDependencies": {
140140
"del-cli": "^7.0.0",
141141
"json": "^11.0.0",
142-
"liquidjs": "^10.22.0"
142+
"liquidjs": "^10.23.0"
143143
},
144144
"topConfig": {
145145
"descriptiveName": "xPack MinGW-w64 GCC",

0 commit comments

Comments
 (0)