From 0a566e4e53672429e5097bc4647592b5b1de1b8b Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Tue, 25 Feb 2025 10:17:36 -0400 Subject: [PATCH 1/5] ci: use ubuntu-latest --- .github/workflows/build-linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index e8be0053..6acece46 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -6,7 +6,7 @@ jobs: build-matrix: strategy: matrix: - os: [ ubuntu-20.04 ] + os: [ ubuntu-latest ] option: [ minimal, default, maximal ] runs-on: ${{ matrix.os }} steps: @@ -69,7 +69,7 @@ jobs: - name: Run tests run: | - if [[ 'ubuntu-20.04' == ${{ matrix.os }} ]] \ + if [[ 'ubuntu-latest' == ${{ matrix.os }} ]] \ && [[ 'default' == ${{ matrix.option }} ]] then cd ${{ github.workspace }}/tests From e47e36dd1385523f18366776a8bdf234443ce8d6 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Tue, 25 Feb 2025 10:49:33 -0400 Subject: [PATCH 2/5] ci: use ubuntu-latest --- .github/workflows/build-linux.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 6acece46..ed17f64b 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -17,18 +17,20 @@ jobs: run: | if [[ 'minimal,default,maximal' =~ ${{ matrix.option }} ]] then - sudo apt-get update -y - sudo apt-get upgrade -y - sudo apt-get install -y libcurl4-openssl-dev apache2-dev + sudo add-apt-repository -y ppa:ubuntugis/ppa + sudo apt update -y + sudo apt upgrade -y + sudo apt install -y libcurl4-openssl-dev apache2-dev + sudo apt install -y libpng-dev libjpeg-dev fi if [[ 'default,maximal' =~ ${{ matrix.option }} ]] then - sudo apt-get install -y libgdal-dev libfcgi-dev libpixman-1-dev - sudo apt-get install -y gdal-bin libxml2-utils + sudo apt install -y libgdal-dev libfcgi-dev libpixman-1-dev + sudo apt install -y gdal-bin libxml2-utils fi if [[ 'maximal' =~ ${{ matrix.option }} ]] then - sudo apt-get install -y libhiredis-dev libdb-dev libmapserver-dev libpcre2-dev + sudo apt install -y libhiredis-dev libdb-dev libmapserver-dev libpcre2-dev fi - name: Build MapCache From 187a0e8e6a92ea3e6c40fe09f3cc5175b160a95d Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Tue, 25 Feb 2025 10:51:43 -0400 Subject: [PATCH 3/5] ci: use ubuntu-latest --- .github/workflows/build-linux.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index ed17f64b..c46aded4 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -18,19 +18,19 @@ jobs: if [[ 'minimal,default,maximal' =~ ${{ matrix.option }} ]] then sudo add-apt-repository -y ppa:ubuntugis/ppa - sudo apt update -y - sudo apt upgrade -y - sudo apt install -y libcurl4-openssl-dev apache2-dev - sudo apt install -y libpng-dev libjpeg-dev + sudo apt-get update -y + sudo apt-get upgrade -y + sudo apt-get install -y libcurl4-openssl-dev apache2-dev + sudo apt-get install -y libpng-dev libjpeg-dev fi if [[ 'default,maximal' =~ ${{ matrix.option }} ]] then - sudo apt install -y libgdal-dev libfcgi-dev libpixman-1-dev - sudo apt install -y gdal-bin libxml2-utils + sudo apt-get install -y libgdal-dev libfcgi-dev libpixman-1-dev + sudo apt-get install -y gdal-bin libxml2-utils fi if [[ 'maximal' =~ ${{ matrix.option }} ]] then - sudo apt install -y libhiredis-dev libdb-dev libmapserver-dev libpcre2-dev + sudo apt-get install -y libhiredis-dev libdb-dev libmapserver-dev libpcre2-dev fi - name: Build MapCache From dd1c1f34bce631846abb38758fd67383f1d1cfb1 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Tue, 25 Feb 2025 11:03:16 -0400 Subject: [PATCH 4/5] ci: use ubuntu-latest --- .github/workflows/build-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index c46aded4..934c4a01 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -17,7 +17,7 @@ jobs: run: | if [[ 'minimal,default,maximal' =~ ${{ matrix.option }} ]] then - sudo add-apt-repository -y ppa:ubuntugis/ppa + sudo add-apt-repository -y ppa:ubuntugis/ubuntugis-unstable sudo apt-get update -y sudo apt-get upgrade -y sudo apt-get install -y libcurl4-openssl-dev apache2-dev From f042c657a5fceb1375940016dfdf7ad9fc9d43e8 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Wed, 5 Mar 2025 12:14:14 -0400 Subject: [PATCH 5/5] handle MapServer 8+ config requirement --- lib/source_mapserver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/source_mapserver.c b/lib/source_mapserver.c index faff7792..ca6141fc 100644 --- a/lib/source_mapserver.c +++ b/lib/source_mapserver.c @@ -60,7 +60,7 @@ struct mc_mapobj { void mapcache_mapserver_connection_constructor(mapcache_context *ctx, void **conn_, void *params) { mapcache_source_mapserver *src = (mapcache_source_mapserver*) params; struct mc_mapobj *mcmap = calloc(1,sizeof(struct mc_mapobj)); - mcmap->map = msLoadMap(src->mapfile,NULL); + mcmap->map = msLoadMap(src->mapfile,NULL, NULL); if(!mcmap->map) { errorObj *errors = NULL; ctx->set_error(ctx, 500, "Failed to load mapfile '%s'",src->mapfile); @@ -229,7 +229,7 @@ void _mapcache_source_mapserver_configuration_check(mapcache_context *ctx, mapca msSetup(); /* do a test load to check the mapfile is correct */ - map = msLoadMap(src->mapfile, NULL); + map = msLoadMap(src->mapfile, NULL, NULL); if(!map) { msWriteError(stderr); ctx->set_error(ctx,400,"failed to load mapfile \"%s\"",src->mapfile);