Skip to content

Commit e7bc71d

Browse files
jmckennajmckenna
authored
Merge pull request #108 from jmckenna/ci-ubuntu-24-04
CI: upgrade to Ubuntu 24.04
2 parents c48e0e2 + b779f84 commit e7bc71d

File tree

8 files changed

+85
-35
lines changed

8 files changed

+85
-35
lines changed

‎.github/workflows/check-crlf.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# check for Windows CRLF in files
2+
# homepage: https://github.com/marketplace/actions/check-crlf
3+
4+
name: Check CRLF
5+
6+
on: [push, pull_request]
7+
8+
jobs:
9+
Check-CRLF:
10+
name: verify that only LF linefeeds are used
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Checkout repository contents
15+
uses: actions/checkout@v4
16+
17+
- name: Use action to check for CRLF endings
18+
uses: erclu/[email protected]
19+
with: # ignore directories containing *.csv & data
20+
exclude: /demo/ /ms4w/ /test/ Makefile.vc

‎.github/workflows/linux.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ apt-get update
77
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
88
gcc libxml2-dev libpq-dev libfcgi-dev \
99
autoconf make flex libfl-dev \
10-
postgresql-12 postgresql-client postgis postgresql-12-postgis-3 postgresql-12-postgis-3-scripts \
10+
postgresql-16 postgresql-client postgis postgresql-16-postgis-3 postgresql-16-postgis-3-scripts \
1111
wget ca-certificates patch valgrind
1212

1313
cd "${WORK_DIR}"
@@ -16,9 +16,9 @@ CFLAGS="-Werror" ./configure
1616
make
1717
make install
1818

19-
cp /etc/postgresql/12/main/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf.bak
20-
echo "local all postgres trust" | cat - /etc/postgresql/12/main/pg_hba.conf.bak > /etc/postgresql/12/main/pg_hba.conf
21-
echo "host all all 127.0.0.1/32 trust" | cat - /etc/postgresql/12/main/pg_hba.conf.bak > /etc/postgresql/12/main/pg_hba.conf
19+
cp /etc/postgresql/16/main/pg_hba.conf /etc/postgresql/16/main/pg_hba.conf.bak
20+
echo "local all postgres trust" | cat - /etc/postgresql/16/main/pg_hba.conf.bak > /etc/postgresql/16/main/pg_hba.conf
21+
echo "host all all 127.0.0.1/32 trust" | cat - /etc/postgresql/16/main/pg_hba.conf.bak > /etc/postgresql/16/main/pg_hba.conf
2222
/etc/init.d/postgresql start
2323

2424
rm -f /etc/tinyows.xml

‎.github/workflows/linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
uses: actions/checkout@v4
1313

1414
- name: Build
15-
run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:20.04 $PWD/.github/workflows/linux.sh
15+
run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:24.04 $PWD/.github/workflows/linux.sh

‎demo/install.sh.in‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,34 @@ elif [ -d /usr/local/pgsql/share/contrib/postgis-3.2 ]; then
2121
PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.2
2222
elif [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then
2323
PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.1
24+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then
25+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5
26+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then
27+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4
28+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then
29+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3
30+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then
31+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2
32+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then
33+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1
2434
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
25-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
35+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
2636
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
27-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
37+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
2838
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then
29-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
39+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
3040
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then
31-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
41+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
3242
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then
33-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
43+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
3444
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
35-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
45+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
3646
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
37-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
47+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
3848
elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
39-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
49+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
4050
else
41-
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
51+
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
4252
fi
4353

4454
echo "Create Spatial Database: $DB"

‎demo/tests/expected/wfs10_describe.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Content-Type: text/xml; subtype=gml/2.1.2;
2121
<xs:complexContent>
2222
<xs:extension base='gml:AbstractFeatureType'>
2323
<xs:sequence>
24-
<xs:element name ='id_geofla' type='long' nillable='true' minOccurs='0' maxOccurs='1'/>
24+
<xs:element name ='id_geofla' type='double' nillable='true' minOccurs='0' maxOccurs='1'/>
2525
<xs:element name ='code_chf_l' nillable='true' minOccurs='0' maxOccurs='1'>
2626
<xs:simpleType><xs:restriction base='string'><xs:maxLength value='3'/></xs:restriction></xs:simpleType></xs:element> <xs:element name ='nom_chf_l' nillable='true' minOccurs='0' maxOccurs='1'>
2727
<xs:simpleType><xs:restriction base='string'><xs:maxLength value='50'/></xs:restriction></xs:simpleType></xs:element> <xs:element name ='x_chf_lieu' type='int' nillable='true' minOccurs='0' maxOccurs='1'/>

‎demo/tests/expected/wfs11_describe.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Content-Type: text/xml; subtype=gml/3.1.1;
2121
<xs:complexContent>
2222
<xs:extension base='gml:AbstractFeatureType'>
2323
<xs:sequence>
24-
<xs:element name ='id_geofla' type='long' nillable='true' minOccurs='0' maxOccurs='1'/>
24+
<xs:element name ='id_geofla' type='double' nillable='true' minOccurs='0' maxOccurs='1'/>
2525
<xs:element name ='code_chf_l' nillable='true' minOccurs='0' maxOccurs='1'>
2626
<xs:simpleType><xs:restriction base='string'><xs:maxLength value='3'/></xs:restriction></xs:simpleType></xs:element> <xs:element name ='nom_chf_l' nillable='true' minOccurs='0' maxOccurs='1'>
2727
<xs:simpleType><xs:restriction base='string'><xs:maxLength value='50'/></xs:restriction></xs:simpleType></xs:element> <xs:element name ='x_chf_lieu' type='int' nillable='true' minOccurs='0' maxOccurs='1'/>

‎test/wfs_100/install_wfs_100.sh.in‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,34 @@ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
1010
PGUSER=postgres
1111
DB=tinyows_test
1212

13-
if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
14-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
13+
if [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then
14+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5
15+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then
16+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4
17+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then
18+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3
19+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then
20+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2
21+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then
22+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1
23+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
24+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
1525
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
16-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
26+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
1727
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then
18-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
28+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
1929
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then
20-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
30+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
2131
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then
22-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
32+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
2333
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
24-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
34+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
2535
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
26-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
36+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
2737
elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
28-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
38+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
2939
else
30-
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
40+
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
3141
fi
3242

3343
echo "Create Spatial Database: $DB"

‎test/wfs_110/install_wfs_110.sh.in‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,34 @@ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
1010
PGUSER=postgres
1111
DB=tinyows_test
1212

13-
if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
14-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
13+
if [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then
14+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5
15+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then
16+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4
17+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then
18+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3
19+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then
20+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2
21+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then
22+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1
23+
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
24+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
1525
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
16-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
26+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
1727
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then
18-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
28+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
1929
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then
20-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
30+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
2131
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then
2232
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
2333
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
24-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
34+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
2535
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
26-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
36+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
2737
elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
28-
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
38+
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
2939
else
30-
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
40+
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
3141
fi
3242

3343
echo "Create Spatial Database: $DB"

0 commit comments

Comments
 (0)