Skip to content

CI: upgrade to Ubuntu 24.04 #108

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 17, 2025
Merged

CI: upgrade to Ubuntu 24.04 #108

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
27ecde7
ci: upgrade to Ubuntu 24.04
jmckenna Mar 13, 2025
52c8c93
ci: upgrade to Ubuntu 24.04
jmckenna Mar 13, 2025
72f08f6
add linefeed check action
jmckenna Mar 13, 2025
5d46702
add linefeed check action
jmckenna Mar 13, 2025
b779f84
ci: upgrade to Ubuntu 24.04
jmckenna Mar 14, 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
20 changes: 20 additions & 0 deletions .github/workflows/check-crlf.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# check for Windows CRLF in files
# homepage: https://github.com/marketplace/actions/check-crlf

name: Check CRLF

on: [push, pull_request]

jobs:
Check-CRLF:
name: verify that only LF linefeeds are used
runs-on: ubuntu-latest

steps:
- name: Checkout repository contents
uses: actions/checkout@v4

- name: Use action to check for CRLF endings
uses: erclu/check-crlf@v1.2.0
with: # ignore directories containing *.csv & data
exclude: /demo/ /ms4w/ /test/ Makefile.vc
8 changes: 4 additions & 4 deletions .github/workflows/linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apt-get update
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
gcc libxml2-dev libpq-dev libfcgi-dev \
autoconf make flex libfl-dev \
postgresql-12 postgresql-client postgis postgresql-12-postgis-3 postgresql-12-postgis-3-scripts \
postgresql-16 postgresql-client postgis postgresql-16-postgis-3 postgresql-16-postgis-3-scripts \
wget ca-certificates patch valgrind

cd "${WORK_DIR}"
Expand All @@ -16,9 +16,9 @@ CFLAGS="-Werror" ./configure
make
make install

cp /etc/postgresql/12/main/pg_hba.conf /etc/postgresql/12/main/pg_hba.conf.bak
echo "local all postgres trust" | cat - /etc/postgresql/12/main/pg_hba.conf.bak > /etc/postgresql/12/main/pg_hba.conf
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
cp /etc/postgresql/16/main/pg_hba.conf /etc/postgresql/16/main/pg_hba.conf.bak
echo "local all postgres trust" | cat - /etc/postgresql/16/main/pg_hba.conf.bak > /etc/postgresql/16/main/pg_hba.conf
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
/etc/init.d/postgresql start

rm -f /etc/tinyows.xml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ jobs:
uses: actions/checkout@v4

- name: Build
run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:20.04 $PWD/.github/workflows/linux.sh
run: docker run --rm -e WORK_DIR=$PWD -v $PWD:$PWD ubuntu:24.04 $PWD/.github/workflows/linux.sh
28 changes: 19 additions & 9 deletions demo/install.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,34 @@ elif [ -d /usr/local/pgsql/share/contrib/postgis-3.2 ]; then
PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.2
elif [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then
PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.1
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
else
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
fi

echo "Create Spatial Database: $DB"
Expand Down
2 changes: 1 addition & 1 deletion demo/tests/expected/wfs10_describe.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Content-Type: text/xml; subtype=gml/2.1.2;
<xs:complexContent>
<xs:extension base='gml:AbstractFeatureType'>
<xs:sequence>
<xs:element name ='id_geofla' type='long' nillable='true' minOccurs='0' maxOccurs='1'/>
<xs:element name ='id_geofla' type='double' nillable='true' minOccurs='0' maxOccurs='1'/>
<xs:element name ='code_chf_l' nillable='true' minOccurs='0' maxOccurs='1'>
<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'>
<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'/>
Expand Down
2 changes: 1 addition & 1 deletion demo/tests/expected/wfs11_describe.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Content-Type: text/xml; subtype=gml/3.1.1;
<xs:complexContent>
<xs:extension base='gml:AbstractFeatureType'>
<xs:sequence>
<xs:element name ='id_geofla' type='long' nillable='true' minOccurs='0' maxOccurs='1'/>
<xs:element name ='id_geofla' type='double' nillable='true' minOccurs='0' maxOccurs='1'/>
<xs:element name ='code_chf_l' nillable='true' minOccurs='0' maxOccurs='1'>
<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'>
<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'/>
Expand Down
30 changes: 20 additions & 10 deletions test/wfs_100/install_wfs_100.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,34 @@ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
PGUSER=postgres
DB=tinyows_test

if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
if [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
else
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
fi

echo "Create Spatial Database: $DB"
Expand Down
28 changes: 19 additions & 9 deletions test/wfs_110/install_wfs_110.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,34 @@ PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
PGUSER=postgres
DB=tinyows_test

if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
if [ -d @POSTGIS_SHARE@/contrib/postgis-3.5 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.5
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.4 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.4
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.3 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.3
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.2 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.2
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.1 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.1
elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.4 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.4
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.3 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.3
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.2 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.2
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.1 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.1
elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.0 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.0
elif [ -d @POSTGIS_SHARE@/contrib/postgis-1.5 ]; then
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
PGSHARE=@POSTGIS_SHARE@/contrib/postgis-1.5
else
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
echo "Unable to find PostGIS dir in @POSTGIS_SHARE@/contrib/" && exit 1
fi

echo "Create Spatial Database: $DB"
Expand Down