diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 2465fcf..5549b50 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -39,9 +39,9 @@ jobs: fail-fast: true matrix: include: - - os: ubuntu-22.04 + - os: [ubuntu-22.04, ubuntu-24.04] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-24.04 steps: - name: Checkout project @@ -57,18 +57,17 @@ jobs: jq gettext build-essential cmake libcppunit-dev doxygen graphviz core_cpp_version=$(curl --silent "https://api.github.com/repos/rok4/core-cpp/releases/latest" | jq -r ".tag_name") - curl -L -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/${core_cpp_version}/librok4-base-${core_cpp_version}-${{ matrix.os }}-amd64.deb + curl -L -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/${core_cpp_version}/librok4-base-${core_cpp_version}-ubuntu-24.04-amd64.deb sudo apt install ./librok4-dev.deb - name: Build packages run: | mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/ -DBUILD_VERSION=${{ github.ref_name }} -DCPACK_SYSTEM_NAME=${{ matrix.os }} .. + cmake -DCMAKE_INSTALL_PREFIX=/ -DBUILD_VERSION=${{ github.ref_name }} -DCPACK_SYSTEM_NAME="ubuntu-24.04" .. make -j2 make package - name: Run unit tests - if: "matrix.os == 'ubuntu-22.04'" run: | cd build make test @@ -81,7 +80,6 @@ jobs: release-tag: ${{ github.ref_name }} - name: Build documentation - if: "matrix.os == 'ubuntu-22.04'" run: | cd build make doc @@ -113,7 +111,6 @@ jobs: run: pip install -r docs/requirements.txt - name: Publish documentation - if: "matrix.os == 'ubuntu-22.04'" run: | git config user.name github-actions git config user.email github-actions@github.com diff --git a/CHANGELOG.md b/CHANGELOG.md index 658aa07..f721fbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ Le format est basé sur [Keep a Changelog](https://keepachangelog.com/) et ce pr ## [Unreleased] +## [6.2.1] - 2026-06-25 + +### Added + +- Compilation des artefacts sous ubuntu 24.04 (compatible debian 13 / trixie) + ## [6.2.0] - 2026-03-16 ### Added - Possibilité de définir un timeout via la variable d'environnement `ROK4_NETWORK_TIMEOUT` (valeur à fournir en seconde) pour les intéraction avec le un service WMS source (pour le getfeature info) @@ -245,7 +251,8 @@ Cette release contient le serveur de diffusion de données raster ou vecteur sto - Suppression du support du WMS 1.1.1 - Suppression de la gestion de styles complexes (quand le valeur finale d'un pixel dépend des valeurs initiales du voisinage, comme le calcul de pente ou d'ombrage) à la volée -[Unreleased]: https://github.com/rok4/server/compare/v6.2.0...HEAD +[Unreleased]: https://github.com/rok4/server/compare/v6.2.1...HEAD +[6.2.1]: https://github.com/rok4/server/compare/v6.2.0...v6.2.1 [6.2.0]: https://github.com/rok4/server/compare/v6.1.6...v6.2.0 [6.1.6]: https://github.com/rok4/server/compare/v6.1.5...v6.1.6 [6.1.5]: https://github.com/rok4/server/compare/v6.1.4...v6.1.5 diff --git a/CMakeLists.txt b/CMakeLists.txt index 22d36c7..a76c36d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,7 +152,7 @@ set(CPACK_PACKAGE_VERSION ${VERSION}) set(CPACK_PACKAGE_VENDOR "IGN") set(CPACK_PACKAGE_CONTACT "IGN - Géoportail ()") -if(CPACK_SYSTEM_NAME AND CPACK_SYSTEM_NAME STREQUAL "ubuntu-20.04" OR CPACK_SYSTEM_NAME STREQUAL "ubuntu-22.04") +if(CPACK_SYSTEM_NAME AND CPACK_SYSTEM_NAME STREQUAL "ubuntu-20.04" OR CPACK_SYSTEM_NAME STREQUAL "ubuntu-22.04" OR CPACK_SYSTEM_NAME STREQUAL "ubuntu-24.04") set(CPACK_GENERATOR "DEB;TGZ") # Debian diff --git a/README.md b/README.md index 3bebb63..c711463 100644 --- a/README.md +++ b/README.md @@ -29,22 +29,22 @@ Installations système requises (listées dans le paquet debian, installées ave ```bash ### librok4-dev -curl -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/x.y.z/librok4-base-x.y.z-ubuntu-20.04-amd64.deb +curl -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/x.y.z/librok4-base-x.y.z-ubuntu-24.04-amd64.deb # or, with ceph driver -curl -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/x.y.z/librok4-ceph-x.y.z-ubuntu-20.04-amd64.deb +curl -o librok4-dev.deb https://github.com/rok4/core-cpp/releases/download/x.y.z/librok4-ceph-x.y.z-ubuntu-24.04-amd64.deb apt install ./librok4-dev.deb ### rok4-server -curl -o rok4-server.deb https://github.com/rok4/server/releases/download/x.y.z/rok4-server-x.y.z-ubuntu-20.04-amd64.deb +curl -o rok4-server.deb https://github.com/rok4/server/releases/download/x.y.z/rok4-server-x.y.z-ubuntu-24.04-amd64.deb apt install ./rok4-server.deb ### installation des styles et des tile matrix sets -curl -o tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/4.1/rok4-tilematrixsets-4.1-linux-all.deb +curl -o tilematrixsets.deb https://github.com/rok4/tilematrixsets/releases/download/4.7/rok4-tilematrixsets-4.7-linux-all.deb apt install ./tilematrixsets.deb -curl -o styles.deb https://github.com/rok4/styles/releases/download/4.1/rok4-styles-4.1-linux-all.deb +curl -o styles.deb https://github.com/rok4/styles/releases/download/4.5/rok4-styles-4.5-linux-all.deb apt install ./rok4-styles.deb ```