[Git][debian-gis-team/mapserver][upstream] New upstream version 8.2.0

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / mapserver


Commits:
ff6cc009 by Bas Couwenberg at 2024-07-08T20:15:08+02:00
New upstream version 8.2.0
- - - - -


4 changed files:

- .github/workflows/build-mapscript-php.yml
- CMakeLists.txt
- HISTORY.md
- ci/build.sh


Changes:

=====================================
.github/workflows/build-mapscript-php.yml
=====================================
@@ -3,9 +3,14 @@ name: Build and test PHP MapScript
 on:
   push:
     branches:
-      - 'main'
+      - '*'
     except:
       - /^(cherry-pick-)?backport-\d+-to-/
+  pull_request:
+    branches:
+      - '*'
+    except:
+      - /^(cherry-pick-)?backport-\d+-to-/      
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
@@ -19,7 +24,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        php-version: [8.1, 8.2]
+        php-version: [8.3, 8.2]
     env:
       IGNORE_COMPARISON_RESULT_ON_CI: 'true'
 


=====================================
CMakeLists.txt
=====================================
@@ -18,7 +18,7 @@ include(CheckCSourceCompiles)
 set (MapServer_VERSION_MAJOR 8)
 set (MapServer_VERSION_MINOR 2)
 set (MapServer_VERSION_REVISION 0)
-set (MapServer_VERSION_SUFFIX "-rc3")
+set (MapServer_VERSION_SUFFIX "")
 
 # Set C++ version
 # Make CMAKE_CXX_STANDARD available as cache option overridable by user


=====================================
HISTORY.md
=====================================
@@ -13,6 +13,11 @@ https://mapserver.org/development/changelog/
 
 The online Migration Guide can be found at https://mapserver.org/MIGRATION_GUIDE.html
 
+8.2.0 release (2024-07-08)
+--------------------------
+
+RC3 was released as the final 8.2.0 (see major changes below)
+
 8.2.0-rc3 release (2024-06-28)
 ------------------------------
 


=====================================
ci/build.sh
=====================================
@@ -43,12 +43,19 @@ python -m pyflakes .
 # run the Python server for the tests
 python -m http.server &> /dev/null &
 
-# get phpunit
+# get PHPUnit
 echo "PHP version"
 php -v
-cd php && curl -LO https://phar.phpunit.de/phpunit-10.phar
-echo "phpunit version"
-php phpunit-10.phar --version
+PHPVersionMinor=$(php --version | head -n 1 | cut -d " " -f 2 | cut -c 1,3)
+if [ ${PHPVersionMinor} -gt 81 ]; then
+    cd php && curl -LO https://phar.phpunit.de/phpunit-11.phar
+    echo "PHPUnit version"
+    php phpunit-11.phar --version
+else
+    cd php && curl -LO https://phar.phpunit.de/phpunit-10.phar
+    echo "PHPUnit version"
+    php phpunit-10.phar --version
+fi
 echo "PHP includes"
 php-config --includes
 



View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/commit/ff6cc0091d44d480b476c47c81df5ceb529dd2a8

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/-/commit/ff6cc0091d44d480b476c47c81df5ceb529dd2a8
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240708/7d1ac319/attachment-0001.htm>