Merge branch 'develop'

codeart1st · Sep 24, 2024 · be7ab72 · be7ab72
2 parents d83f5d4 + a3ba7a9
commit be7ab72
Show file tree

Hide file tree

Showing 12 changed files with 8,755 additions and 1,423 deletions.
diff --git a/.github/actions/prepare-build-env/action.yml b/.github/actions/prepare-build-env/action.yml
@@ -9,8 +9,8 @@ runs:
       run: |
         git clone https://github.com/emscripten-core/emsdk.git
         cd emsdk
-        ./emsdk install 3.1.65
-        ./emsdk activate 3.1.65
+        ./emsdk install 3.1.67
+        ./emsdk activate 3.1.67
         source ./emsdk_env.sh
         # Export emsdk environment variables
         echo "PATH=$PATH" >> $GITHUB_ENV

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
           emmake make install -j$(nproc)
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: libxml2
           path: dist/
@@ -92,7 +92,7 @@ jobs:
           emmake make install -j$(nproc)
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: SQLite
           path: dist/
@@ -125,7 +125,7 @@ jobs:
           emmake make install -j$(nproc)
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: GEOS
           path: dist/
@@ -170,7 +170,7 @@ jobs:
           emmake make install -j$(nproc)
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: PROJ
           path: dist/
@@ -222,7 +222,7 @@ jobs:
           emmake make install -j$(nproc)
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: GDAL
           path: dist/
@@ -283,7 +283,7 @@ jobs:
           cp ../src/*.h $GITHUB_WORKSPACE/dist/include
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: MapServer
           path: dist/
@@ -317,7 +317,7 @@ jobs:
         run: emmake make
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.4.0
         with:
           name: WASM
           path: |

diff --git a/README.md b/README.md
@@ -26,14 +26,14 @@
 
 |Name|Version|Home page|License|Status|
 |----|-------|---------|-------|-------|
-|**MapServer**|8.2.1|https://mapserver.org/|MIT|✅|
+|**MapServer**|8.2.2|https://mapserver.org/|MIT|✅|
 |**GDAL/OGR**|3.9.2|https://gdal.org/|MIT/X style|✅|
-|**PROJ**|9.4.1|https://proj.org/|MIT/X style|✅|
-|**GEOS**|3.12.2|https://libgeos.org/|LGPL-2.1|✅|
+|**PROJ**|9.5.0|https://proj.org/|MIT/X style|✅|
+|**GEOS**|3.13.0|https://libgeos.org/|LGPL-2.1|✅|
 |**SQLite**|3.46.1|https://www.sqlite.org/|Public Domain|✅|
-|**Libxml2**|2.13.3|http://xmlsoft.org/|MIT|✅|
+|**Libxml2**|2.13.4|http://xmlsoft.org/|MIT|✅|
 
-✅ up-to-date | 🚧 needs-update | Last update check 29.08.2024
+✅ up-to-date | 🚧 needs-update | Last update check 24.09.2024
 
 # Getting started
 
@@ -107,7 +107,7 @@ git pull --recurse-submodules
 
 Start the build container with the following command to ensure the filesystem permissions for newly created files are correct.
 ```sh
-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
+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
 ```
 And execute in a second terminal the following command to install the missing build depedencies as root user.
 ```sh