Skip to content

Commit be7ab72

Browse files
committed
Merge branch 'develop'
2 parents d83f5d4 + a3ba7a9 commit be7ab72

File tree

12 files changed

+8755
-1423
lines changed

12 files changed

+8755
-1423
lines changed

.github/actions/prepare-build-env/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ runs:
99
run: |
1010
git clone https://github.com/emscripten-core/emsdk.git
1111
cd emsdk
12-
./emsdk install 3.1.65
13-
./emsdk activate 3.1.65
12+
./emsdk install 3.1.67
13+
./emsdk activate 3.1.67
1414
source ./emsdk_env.sh
1515
# Export emsdk environment variables
1616
echo "PATH=$PATH" >> $GITHUB_ENV

.github/workflows/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
emmake make install -j$(nproc)
5151
5252
- name: Upload build artifacts
53-
uses: actions/upload-artifact@v4.3.6
53+
uses: actions/upload-artifact@v4.4.0
5454
with:
5555
name: libxml2
5656
path: dist/
@@ -92,7 +92,7 @@ jobs:
9292
emmake make install -j$(nproc)
9393
9494
- name: Upload build artifacts
95-
uses: actions/upload-artifact@v4.3.6
95+
uses: actions/upload-artifact@v4.4.0
9696
with:
9797
name: SQLite
9898
path: dist/
@@ -125,7 +125,7 @@ jobs:
125125
emmake make install -j$(nproc)
126126
127127
- name: Upload build artifacts
128-
uses: actions/upload-artifact@v4.3.6
128+
uses: actions/upload-artifact@v4.4.0
129129
with:
130130
name: GEOS
131131
path: dist/
@@ -170,7 +170,7 @@ jobs:
170170
emmake make install -j$(nproc)
171171
172172
- name: Upload build artifacts
173-
uses: actions/upload-artifact@v4.3.6
173+
uses: actions/upload-artifact@v4.4.0
174174
with:
175175
name: PROJ
176176
path: dist/
@@ -222,7 +222,7 @@ jobs:
222222
emmake make install -j$(nproc)
223223
224224
- name: Upload build artifacts
225-
uses: actions/upload-artifact@v4.3.6
225+
uses: actions/upload-artifact@v4.4.0
226226
with:
227227
name: GDAL
228228
path: dist/
@@ -283,7 +283,7 @@ jobs:
283283
cp ../src/*.h $GITHUB_WORKSPACE/dist/include
284284
285285
- name: Upload build artifacts
286-
uses: actions/upload-artifact@v4.3.6
286+
uses: actions/upload-artifact@v4.4.0
287287
with:
288288
name: MapServer
289289
path: dist/
@@ -317,7 +317,7 @@ jobs:
317317
run: emmake make
318318

319319
- name: Upload build artifacts
320-
uses: actions/upload-artifact@v4.3.6
320+
uses: actions/upload-artifact@v4.4.0
321321
with:
322322
name: WASM
323323
path: |

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@
2626

2727
|Name|Version|Home page|License|Status|
2828
|----|-------|---------|-------|-------|
29-
|**MapServer**|8.2.1|https://mapserver.org/|MIT||
29+
|**MapServer**|8.2.2|https://mapserver.org/|MIT||
3030
|**GDAL/OGR**|3.9.2|https://gdal.org/|MIT/X style||
31-
|**PROJ**|9.4.1|https://proj.org/|MIT/X style||
32-
|**GEOS**|3.12.2|https://libgeos.org/|LGPL-2.1||
31+
|**PROJ**|9.5.0|https://proj.org/|MIT/X style||
32+
|**GEOS**|3.13.0|https://libgeos.org/|LGPL-2.1||
3333
|**SQLite**|3.46.1|https://www.sqlite.org/|Public Domain||
34-
|**Libxml2**|2.13.3|http://xmlsoft.org/|MIT||
34+
|**Libxml2**|2.13.4|http://xmlsoft.org/|MIT||
3535

36-
✅ up-to-date | 🚧 needs-update | Last update check 29.08.2024
36+
✅ up-to-date | 🚧 needs-update | Last update check 24.09.2024
3737

3838
# Getting started
3939

@@ -107,7 +107,7 @@ git pull --recurse-submodules
107107

108108
Start the build container with the following command to ensure the filesystem permissions for newly created files are correct.
109109
```sh
110-
docker run -it --rm -v $(pwd):/src -v /etc/passwd:/etc/passwd --user "$(id -u):$(id -g)" --name mapserver-wasm emscripten/emsdk:3.1.65 bash
110+
docker run -it --rm -v $(pwd):/src -v /etc/passwd:/etc/passwd --user "$(id -u):$(id -g)" --name mapserver-wasm emscripten/emsdk:3.1.67 bash
111111
```
112112
And execute in a second terminal the following command to install the missing build depedencies as root user.
113113
```sh

0 commit comments

Comments
 (0)