Skip to content

CI: ubuntu-20.04 deprecated on 2025-02-01 #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmckenna merged 5 commits into from
Mar 7, 2025
Merged

CI: ubuntu-20.04 deprecated on 2025-02-01 #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a566e4
ci: use ubuntu-latest
jmckenna Feb 25, 2025
e47e36d
ci: use ubuntu-latest
jmckenna Feb 25, 2025
187a0e8
ci: use ubuntu-latest
jmckenna Feb 25, 2025
dd1c1f3
ci: use ubuntu-latest
jmckenna Feb 25, 2025
f042c65
handle MapServer 8+ config requirement
jmckenna Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/build-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -17,9 +17,11 @@ jobs:
run: |
if [[ 'minimal,default,maximal' =~ ${{ matrix.option }} ]]
then
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
sudo apt-get install -y libpng-dev libjpeg-dev
fi
if [[ 'default,maximal' =~ ${{ matrix.option }} ]]
then
Expand Down Expand Up @@ -69,7 +71,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
Expand Down
4 changes: 2 additions & 2 deletions lib/source_mapserver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Loading