Skip to content

Commit 4916c24

Browse files
Merge pull request #359 from OpenWebGAL/dev
4.5.11
2 parents 955440d + e89f78e commit 4916c24

File tree

30 files changed

+4696
-4809
lines changed

30 files changed

+4696
-4809
lines changed

.github/workflows/build-terre.yml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
name: Build WebGAL Terre
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- main
8+
pull_request:
9+
types:
10+
- opened
11+
- reopened
12+
- synchronize
713

814
jobs:
915
build-linux:
@@ -15,17 +21,19 @@ jobs:
1521
- name: Install Node.js
1622
uses: actions/setup-node@v4
1723
with:
18-
node-version: 18
24+
node-version-file: package.json
1925
cache: 'yarn'
2026
- name: Build
2127
env:
2228
GH_TOKEN: ${{ secrets.GH_TOKEN }}
2329
run: sh release-linux.sh
30+
- name: Compress
31+
run: 7z a -tzip release/WebGAL_Terre_Linux.zip release/*
2432
- name: Upload Artifact
2533
uses: actions/upload-artifact@v4
2634
with:
2735
name: WebGAL_Terre_Linux
28-
path: release
36+
path: release/WebGAL_Terre_Linux.zip
2937
build-arm64:
3038
name: Build Linux ARM64 Binary
3139
runs-on: ubuntu-latest
@@ -35,7 +43,7 @@ jobs:
3543
- name: Install Node.js
3644
uses: actions/setup-node@v4
3745
with:
38-
node-version: 18
46+
node-version-file: package.json
3947
cache: 'yarn'
4048
- name: Build Stage 1
4149
run: |
@@ -110,11 +118,14 @@ jobs:
110118
rm -rf assets/templates/WebGAL_Android_Template/app/src/main/assets/webgal/.gitkeep
111119
rm -rf assets/templates/WebGAL_Android_Template/app/src/main/java/com
112120
echo "WebGAL Terre is now ready to be deployed."
121+
- name: Compress
122+
run: 7z a -tzip release/WebGAL_Terre_Linux_Arm64.zip release/*
123+
113124
- name: Upload Artifact
114125
uses: actions/upload-artifact@v4
115126
with:
116127
name: WebGAL_Terre_Linux_Arm64
117-
path: release
128+
path: release/WebGAL_Terre_Linux_Arm64.zip
118129
build-mac:
119130
name: Build MacOS Binary
120131
runs-on: macos-14
@@ -124,17 +135,19 @@ jobs:
124135
- name: Install Node.js
125136
uses: actions/setup-node@v4
126137
with:
127-
node-version: 18
138+
node-version-file: package.json
128139
cache: 'yarn'
129140
- name: Build
130141
env:
131142
GH_TOKEN: ${{ secrets.GH_TOKEN }}
132143
run: sh release-mac.sh
144+
- name: Compress
145+
run: 7z a -tzip release/WebGAL_Terre_Mac.zip release/*
133146
- name: Upload Artifact
134147
uses: actions/upload-artifact@v4
135148
with:
136149
name: WebGAL_Terre_Mac
137-
path: release
150+
path: release/WebGAL_Terre_Mac.zip
138151
build-windows:
139152
name: Build Windows Binary
140153
runs-on: windows-latest
@@ -144,16 +157,18 @@ jobs:
144157
- name: Install Node.js
145158
uses: actions/setup-node@v4
146159
with:
147-
node-version: 18
160+
node-version-file: package.json
148161
cache: 'yarn'
149162
- name: Build
150163
shell: bash
151164
run: ./release.sh
165+
- name: Compress
166+
run: 7z a -tzip release/WebGAL_Terre_Windows.zip release/*
152167
- name: Upload Artifact
153168
uses: actions/upload-artifact@v4
154169
with:
155170
name: WebGAL_Terre_Windows
156-
path: release
171+
path: release/WebGAL_Terre_Windows.zip
157172
build-windows-nsis:
158173
name: Build Windows Setup
159174
runs-on: windows-latest
@@ -163,7 +178,7 @@ jobs:
163178
- name: Install Node.js
164179
uses: actions/setup-node@v4
165180
with:
166-
node-version: 18
181+
node-version-file: package.json
167182
cache: 'yarn'
168183
- name: Build
169184
shell: bash
@@ -176,4 +191,3 @@ jobs:
176191
with:
177192
name: WebGAL_Terre_Windows_Setup
178193
path: bundle/WebGal_Terre_Setup.exe
179-

.github/workflows/pr-check.yml

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

0 commit comments

Comments
 (0)