Travis CI: update to jammy

PPazderski · Nov 7, 2023 · 42e4386 · 42e4386
1 parent 9a3e48a
commit 42e4386
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ matrix:
       compiler: gcc
       language: cpp
       sudo: false
-      dist: bionic
+      dist: jammy
       cache:
         apt: true
         directories:
@@ -33,7 +33,7 @@ matrix:
       compiler: gcc
       language: cpp
       sudo: false
-      dist: bionic
+      dist: jammy
       cache:
         apt: true
         directories:

diff --git a/ci/travis/graviton2/before_install.sh b/ci/travis/graviton2/before_install.sh
@@ -3,15 +3,12 @@
 set -e
 
 sudo pip uninstall -y setuptools
-sudo rm -rf /usr/local/lib/python3.6/
+sudo rm -rf /usr/local/lib/python*
 sudo apt-get remove -f python
 
 sudo apt-get update
 sudo apt-get install -y software-properties-common
 sudo apt-get update
-sudo apt-get install -y --allow-unauthenticated python3-numpy python3-setuptools libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev poppler-utils libfreexl-dev unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libpcre3-dev libcrypto++-dev libfyba-dev libkml-dev libmysqlclient-dev mysql-client-core-5.7 libogdi3.2-dev libcfitsio-dev openjdk-8-jdk libzstd1-dev libblosc-dev liblz4-dev ccache bash zip curl libpq-dev postgresql-client postgis cmake libssl-dev libboost-dev autoconf automake sqlite3 libopenexr-dev make python3-dev g++ fossil libgeotiff-dev libopenjp2-7-dev libcairo2-dev ca-certificates
-
-# Workaround bug in ogdi packaging
-sudo ln -s /usr/lib/ogdi/libvrf.so /usr/lib
+sudo apt-get install -y --allow-unauthenticated python3-pip python3-numpy python3-setuptools libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev poppler-utils libfreexl-dev unixodbc-dev libwebp-dev liblcms2-2 libpcre3-dev libcrypto++-dev libfyba-dev libkml-dev libmysqlclient-dev mysql-client-core-8.0 libcfitsio-dev openjdk-8-jdk libzstd-dev libblosc-dev liblz4-dev ccache bash zip curl libpq-dev postgresql-client postgis cmake libssl-dev libboost-dev autoconf automake sqlite3 libopenexr-dev make python3-dev g++ fossil libgeotiff-dev libopenjp2-7-dev libcairo2-dev ca-certificates
 
 sudo rm -rf /usr/bin/python
diff --git a/ci/travis/graviton2/install.sh b/ci/travis/graviton2/install.sh
@@ -33,6 +33,6 @@ sh -c "cd $PWD/build && CCACHE_CPP2=yes make -j3"
 sudo sh -c "rm -f /usr/lib/libgdal.so*"
 sudo sh -c "cd $PWD/build && make install"
 sudo sh -c "sudo ldconfig"
-sudo sh -c "ln -s libgdal.so /usr/lib/libgdal.so.20"
+sudo sh -c "ln -s libgdal.so /usr/lib/libgdal.so.30"
 
 ccache -s
diff --git a/ci/travis/graviton2/script.sh b/ci/travis/graviton2/script.sh
@@ -2,12 +2,14 @@
 
 set -e
 
+gdalinfo --version
+
 export PYTEST="python3 -m pytest -vv -p no:sugar --color=no"
 
 (cd "$PWD/build" && make quicktest)
 
 # install pip and use it to install test dependencies
-sudo sh -c "curl -sSL 'https://bootstrap.pypa.io/pip/3.6/get-pip.py' | python3"
+sudo sh -c "curl -sSL 'https://bootstrap.pypa.io/pip/get-pip.py' | python3"
 sudo pip3 install -U -r "$PWD/autotest/requirements.txt"
 
 # Run all the Python autotests

diff --git a/ci/travis/s390x/before_install.sh b/ci/travis/s390x/before_install.sh
@@ -3,15 +3,12 @@
 set -e
 
 sudo pip uninstall -y setuptools
-sudo rm -rf /usr/local/lib/python3.6/
+sudo rm -rf /usr/local/lib/python*
 sudo apt-get remove -f python
 
 sudo apt-get update
 sudo apt-get install -y software-properties-common
 sudo apt-get update
-sudo apt-get install -y --allow-unauthenticated python3-numpy python3-setuptools libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev poppler-utils libfreexl-dev unixodbc-dev libwebp-dev libepsilon-dev liblcms2-2 libpcre3-dev libcrypto++-dev libfyba-dev libkml-dev libmysqlclient-dev mysql-client-core-5.7 libogdi3.2-dev libcfitsio-dev openjdk-8-jdk libzstd1-dev libblosc-dev liblz4-dev ccache bash zip curl libpq-dev postgresql-client postgis cmake libssl-dev libboost-dev autoconf automake sqlite3 libopenexr-dev make python3-dev g++ fossil libgeotiff-dev libopenjp2-7-dev libcairo2-dev ca-certificates
-
-# Workaround bug in ogdi packaging
-sudo ln -s /usr/lib/ogdi/libvrf.so /usr/lib
+sudo apt-get install -y --allow-unauthenticated python3-pip python3-numpy python3-setuptools libpng-dev libjpeg-dev libgif-dev liblzma-dev libgeos-dev libcurl4-gnutls-dev libproj-dev libxml2-dev libexpat-dev libxerces-c-dev libnetcdf-dev netcdf-bin libpoppler-dev libpoppler-private-dev libspatialite-dev gpsbabel swig libhdf4-alt-dev libhdf5-serial-dev poppler-utils libfreexl-dev unixodbc-dev libwebp-dev liblcms2-2 libpcre3-dev libcrypto++-dev libfyba-dev libkml-dev libmysqlclient-dev mysql-client-core-8.0 libcfitsio-dev openjdk-8-jdk libzstd-dev libblosc-dev liblz4-dev ccache bash zip curl libpq-dev postgresql-client postgis cmake libssl-dev libboost-dev autoconf automake sqlite3 libopenexr-dev make python3-dev g++ fossil libgeotiff-dev libopenjp2-7-dev libcairo2-dev ca-certificates
 
 sudo rm -rf /usr/bin/python
diff --git a/ci/travis/s390x/install.sh b/ci/travis/s390x/install.sh
@@ -33,6 +33,6 @@ sh -c "cd $PWD/build && CCACHE_CPP2=yes make -j3"
 sudo sh -c "rm -f /usr/lib/libgdal.so*"
 sudo sh -c "cd $PWD/build && make install"
 sudo sh -c "sudo ldconfig"
-sudo sh -c "ln -s libgdal.so /usr/lib/libgdal.so.20"
+sudo sh -c "ln -s libgdal.so /usr/lib/libgdal.so.30"
 
 ccache -s
diff --git a/ci/travis/s390x/script.sh b/ci/travis/s390x/script.sh
@@ -2,12 +2,14 @@
 
 set -e
 
+gdalinfo --version
+
 export PYTEST="python3 -m pytest -vv -p no:sugar --color=no"
 
 (cd "$PWD/build" && make quicktest)
 
 # install pip and use it to install test dependencies
-sudo sh -c "curl -sSL 'https://bootstrap.pypa.io/pip/3.6/get-pip.py' | python3"
+sudo sh -c "curl -sSL 'https://bootstrap.pypa.io/pip/get-pip.py' | python3"
 sudo pip3 install -U -r "$PWD/autotest/requirements.txt"
 
 # Run all the Python autotests