From d5c09b7e9b3ba1a138ed73d973e952bbd7da938e Mon Sep 17 00:00:00 2001 From: Daniel Baston Date: Wed, 8 Nov 2023 07:47:08 -0500 Subject: [PATCH] CI: Remove Ubuntu 18.04 i386 configuration --- .github/workflows/linux_build.yml | 7 -- .../ubuntu_18.04_32bit/Dockerfile.ci | 100 ------------------ .github/workflows/ubuntu_18.04_32bit/build.sh | 16 --- .github/workflows/ubuntu_18.04_32bit/test.sh | 30 ------ 4 files changed, 153 deletions(-) delete mode 100644 .github/workflows/ubuntu_18.04_32bit/Dockerfile.ci delete mode 100755 .github/workflows/ubuntu_18.04_32bit/build.sh delete mode 100755 .github/workflows/ubuntu_18.04_32bit/test.sh diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index f31b93d5affd..8f50df36ac8f 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -116,13 +116,6 @@ jobs: container: icc build_script: build.sh - - name: Ubuntu 18.04, gcc 32-bit - id: ubuntu_18.04_32bit - container: ubuntu_18.04_32bit - build_script: build.sh - test_script: test.sh - travis_branch: ubuntu_1804_32bit - name: ${{ matrix.name }} runs-on: ubuntu-latest diff --git a/.github/workflows/ubuntu_18.04_32bit/Dockerfile.ci b/.github/workflows/ubuntu_18.04_32bit/Dockerfile.ci deleted file mode 100644 index 449c6fe7db7c..000000000000 --- a/.github/workflows/ubuntu_18.04_32bit/Dockerfile.ci +++ /dev/null @@ -1,100 +0,0 @@ -FROM i386/ubuntu:18.04 - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update && \ - apt-get install -y --allow-unauthenticated \ - autoconf \ - automake \ - bash \ - ccache \ - cmake \ - curl \ - fossil \ - g++ \ - git \ - gpsbabel \ - grep \ - libblosc-dev \ - libboost-dev \ - libcairo2-dev \ - libcfitsio-dev \ - libcrypto++-dev \ - libcurl4-gnutls-dev \ - libepsilon-dev \ - libexpat-dev \ - libfcgi-dev \ - libfyba-dev \ - libgeos-dev \ - libgeotiff-dev \ - libgif-dev \ - libhdf4-alt-dev \ - libhdf5-serial-dev \ - libjpeg-dev \ - libkml-dev \ - liblcms2-2 \ - liblz4-dev \ - liblzma-dev \ - libmysqlclient-dev \ - libnetcdf-dev \ - libogdi3.2-dev \ - libopenexr-dev \ - libopenjp2-7-dev \ - libpcre3-dev \ - libpng-dev \ - libpoppler-dev \ - libpoppler-private-dev \ - libpq-dev \ - libproj-dev \ - libspatialite-dev \ - libssl-dev \ - libtool \ - libwebp-dev \ - libxerces-c-dev \ - libxml2-dev \ - libxslt-dev \ - libzstd1-dev \ - mysql-client-core-5.7 \ - netcdf-bin \ - openjdk-8-jdk \ - poppler-utils \ - postgis \ - postgresql-client \ - python3-dev \ - python3-numpy \ - python3-pip \ - python3-setuptools \ - sqlite3 \ - swig \ - unixodbc-dev \ - zip \ - && rm -rf /var/lib/apt/lists/* - -ENV LANG=en_US.UTF-8 -RUN echo "$LANG UTF-8" >/etc/locale.gen \ - && dpkg-reconfigure --frontend=noninteractive locales \ - && update-locale LANG=$LANG - -# Build freexl -RUN curl -O http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-2.0.0-RC0.tar.gz -RUN tar xzf freexl-2.0.0-RC0.tar.gz -RUN cd freexl-2.0.0-RC0 && CC='ccache gcc' CXX='ccache g++' ./configure --disable-static --prefix=/usr && make -j3 && make -j3 install - -# Build libspatialite -RUN fossil --user $(whoami) clone https://www.gaia-gis.it/fossil/libspatialite libspatialite.fossil && mkdir sl && (cd sl && fossil open ../libspatialite.fossil && CC='ccache gcc' CXX='ccache g++' ./configure --disable-static --prefix=/usr --disable-geos370 --disable-rttopo --disable-geos3100 --disable-geos3110 && make -j3 && make -j3 install) - -# Build librasterlite2 -RUN fossil --user $(whoami) clone https://www.gaia-gis.it/fossil/librasterlite2 librasterlite2.fossil && mkdir rl2 && (cd rl2 && fossil open ../librasterlite2.fossil && fossil checkout 9dd8217cb9 && CC='ccache gcc' CXX='ccache g++' ./configure --disable-static --prefix=/usr --disable-lz4 --disable-zstd && make -j3 && make -j3 install) - -# Build proj -RUN curl -O https://download.osgeo.org/proj/proj-6.0.0.tar.gz \ - && tar xzvf proj-6.0.0.tar.gz \ - && cd proj-6.0.0 \ - && CC='ccache gcc' CXX='ccache g++' CFLAGS='-DPROJ_RENAME_SYMBOLS' CXXFLAGS='-DPROJ_RENAME_SYMBOLS' ./configure \ - --disable-static \ - --prefix=/usr/local || cat config.log \ - && make -j3 install -RUN apt-get remove -y libproj-dev && ldconfig - -COPY requirements.txt /tmp/ -RUN python3 -m pip install -U -r /tmp/requirements.txt diff --git a/.github/workflows/ubuntu_18.04_32bit/build.sh b/.github/workflows/ubuntu_18.04_32bit/build.sh deleted file mode 100755 index b829b6d31373..000000000000 --- a/.github/workflows/ubuntu_18.04_32bit/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -set -e - -cmake ${GDAL_SOURCE_DIR:=..} \ - -DCMAKE_C_FLAGS="-Werror -DPROJ_RENAME_SYMBOLS" \ - -DCMAKE_CXX_FLAGS="-Werror -DPROJ_RENAME_SYMBOLS" \ - -DCMAKE_SHARED_LINKER_FLAGS="-lstdc++" \ - -DUSE_CCACHE=ON \ - -DPROJ_ROOT=/usr/local \ - -DCMAKE_BUILD_TYPE=Debug \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DGDAL_USE_GEOTIFF_INTERNAL:BOOL=ON \ - -DGDAL_USE_TIFF_INTERNAL:BOOL=ON - -make -j3 diff --git a/.github/workflows/ubuntu_18.04_32bit/test.sh b/.github/workflows/ubuntu_18.04_32bit/test.sh deleted file mode 100755 index 65f5b11fb26d..000000000000 --- a/.github/workflows/ubuntu_18.04_32bit/test.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -set -e - -. ../scripts/setdevenv.sh - -export PYTEST="python3 -m pytest -vv -p no:sugar --color=no" - -make quicktest - -PYTEST_SKIP= -PYTEST_XFAIL="gcore/tiff_ovr.py gdrivers/gribmultidim.py gdrivers/mbtiles.py gdrivers/vrtwarp.py gdrivers/wcs.py utilities/test_gdalwarp.py pyscripts/test_gdal_pansharpen.py" - -# Fails with ERROR 1: OGDI DataSource Open Failed: Could not find the dynamic library "vrf" -PYTEST_SKIP="ogr/ogr_ogdi.py $PYTEST_SKIP" - -# Stalls on it. Probably not enough memory -PYTEST_SKIP="gdrivers/jp2openjpeg.py $PYTEST_SKIP" - -# Failures for the following tests. See https://github.com/OSGeo/gdal/runs/1425843044 - -# depends on tiff_ovr.py that is going to be removed below -(cd autotest && $PYTEST utilities/test_gdaladdo.py) -PYTEST_SKIP="autotest/utilities/test_gdaladdo.py $PYTEST_SKIP" - -for i in $PYTEST_XFAIL ; do - (cd autotest && $PYTEST $i || echo "Ignoring failure") -done - -(cd autotest && $PYTEST $(echo " $PYTEST_SKIP $PYTEST_XFAIL" | sed -r 's/[[:space:]]+/ --ignore=/g'))