Skip to content

Commit

Permalink
Merge pull request OSGeo#8680 from dbaston/ci-ubuntu-2204
Browse files Browse the repository at this point in the history
CI: Remove Ubuntu 18.04 configurations
  • Loading branch information
rouault authored Nov 9, 2023
2 parents 31109aa + 0d030ef commit 170bc25
Show file tree
Hide file tree
Showing 18 changed files with 242 additions and 259 deletions.
31 changes: 31 additions & 0 deletions .github/workflows/alpine_32bit/Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
FROM i386/alpine:3.18

RUN apk add \
bash \
linux-headers gnu-libiconv-dev \
g++ make ccache cmake \
proj-dev proj proj-util \
curl-dev tiff-dev \
zlib-dev zstd-dev xz-dev snappy-dev \
libjpeg-turbo-dev libpng-dev openjpeg-dev libwebp-dev expat-dev libkml-dev \
py3-numpy-dev python3-dev py3-setuptools py3-numpy py3-pip swig \
poppler-dev postgresql-dev \
openexr-dev libheif-dev xerces-c-dev geos-dev cfitsio-dev \
netcdf-dev libaec-dev hdf5-dev freexl-dev \
lz4-dev blosc-dev libdeflate-dev brotli-dev uriparser-dev \
libarchive-dev \
kealib-dev libjxl-dev \
json-c-dev giflib-dev \
libspatialite-dev librasterlite2-dev \
mariadb-connector-c-dev \
pcre2-dev \
qhull-dev \
unixodbc-dev \
libpq-dev \
apache-arrow-dev \
py3-pyarrow \
libxml2-dev libxslt-dev \
podofo-dev

COPY requirements.txt /tmp/
RUN python3 -m pip install --break-system-packages -U -r /tmp/requirements.txt
12 changes: 12 additions & 0 deletions .github/workflows/alpine_32bit/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/sh

set -e

cmake ${GDAL_SOURCE_DIR:=..} \
-DCMAKE_BUILD_TYPE=Debug \
-DUSE_CCACHE=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DIconv_INCLUDE_DIR=/usr/include/gnu-libiconv \
-DIconv_LIBRARY=/usr/lib/libiconv.so \
-DCMAKE_C_FLAGS=-Werror -DCMAKE_CXX_FLAGS=-Werror -DWERROR_DEV_FLAG="-Werror=dev"
make -j$(nproc)
File renamed without changes.
30 changes: 15 additions & 15 deletions .github/workflows/linux_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,27 @@ jobs:
container: alpine
build_script: build.sh

- name: Alpine, gcc 32-bit
id: alpine_32bit
container: alpine_32bit
build_script: build.sh
test_script: test.sh
travis_branch: alpine_32bit

- name: Fedora Rawhide, clang++
id: fedora_rawhide
travis_branch: sanitize
container: fedora_rawhide
build_script: build.sh

- name: Ubuntu 22.04, gcc
id: ubuntu_22.04
travis_branch: ubuntu_2204
container: ubuntu_22.04
before_test_script: services.sh
build_script: build.sh
test_script: test.sh

- name: Ubuntu 20.04, clang ASAN
id: asan
travis_branch: sanitize
Expand Down Expand Up @@ -102,21 +117,6 @@ jobs:
container: icc
build_script: build.sh

- name: Ubuntu 18.04, gcc
id: ubuntu_18.04
container: ubuntu_18.04
build_script: build.sh
before_test_script: services.sh
test_script: test.sh
travis_branch: ubuntu_1804

- 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
Expand Down
57 changes: 0 additions & 57 deletions .github/workflows/ubuntu_18.04/Dockerfile.ci

This file was deleted.

22 changes: 0 additions & 22 deletions .github/workflows/ubuntu_18.04/build.sh

This file was deleted.

41 changes: 0 additions & 41 deletions .github/workflows/ubuntu_18.04/test.sh

This file was deleted.

100 changes: 0 additions & 100 deletions .github/workflows/ubuntu_18.04_32bit/Dockerfile.ci

This file was deleted.

16 changes: 0 additions & 16 deletions .github/workflows/ubuntu_18.04_32bit/build.sh

This file was deleted.

Loading

0 comments on commit 170bc25

Please sign in to comment.