diff options
| author | Kai Pastor <dg0yt@darc.de> | 2022-02-05 12:01:28 +0100 |
|---|---|---|
| committer | Kai Pastor <dg0yt@darc.de> | 2022-02-05 18:06:45 +0100 |
| commit | 295c67869270dc9319f965f1c18108fad516296e (patch) | |
| tree | 3ac228c779232d630248edadc1f83912ddca9247 /.github | |
| parent | 845d679d9801f5dd177b20630fbf8ec581600e52 (diff) | |
| download | PROJ-295c67869270dc9319f965f1c18108fad516296e.tar.gz PROJ-295c67869270dc9319f965f1c18108fad516296e.zip | |
Harmonize CI apt setup
Diffstat (limited to '.github')
| -rwxr-xr-x | .github/workflows/clang_linux/start.sh | 8 | ||||
| -rwxr-xr-x | .github/workflows/linux_gcc_32bit/start.sh | 12 | ||||
| -rwxr-xr-x | .github/workflows/linux_gcc_5_4/start.sh | 12 |
3 files changed, 18 insertions, 14 deletions
diff --git a/.github/workflows/clang_linux/start.sh b/.github/workflows/clang_linux/start.sh index b0a5ac34..81eca492 100755 --- a/.github/workflows/clang_linux/start.sh +++ b/.github/workflows/clang_linux/start.sh @@ -4,8 +4,12 @@ set -e apt-get update -y DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - sudo autoconf automake libtool clang++-10 python3-clang-10 make cmake ccache pkg-config tar zip \ - sqlite3 libsqlite3-dev libtiff-dev libcurl4-openssl-dev jq python3-pip nlohmann-json3-dev libgtest-dev + autoconf automake libtool make cmake ccache pkg-config python3-pip sqlite3 tar zip \ + clang++-10 jq python3-clang-10 \ + libsqlite3-dev \ + libtiff-dev \ + libcurl4-openssl-dev \ + nlohmann-json3-dev libgtest-dev python3 -m pip install --user jsonschema export PATH=$HOME/.local/bin:$PATH diff --git a/.github/workflows/linux_gcc_32bit/start.sh b/.github/workflows/linux_gcc_32bit/start.sh index c54eb5ed..87a98a0b 100755 --- a/.github/workflows/linux_gcc_32bit/start.sh +++ b/.github/workflows/linux_gcc_32bit/start.sh @@ -9,14 +9,14 @@ export TRAVIS_BUILD_DIR="$WORK_DIR" ARCH=i386 dpkg --add-architecture i386 -apt update -y +apt-get update -y DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends -o APT::Immediate-Configure=0 \ - autoconf automake libtool gcc-multilib g++-multilib g++ sqlite3 \ - python3-pip \ - make cmake ccache pkg-config tar zip \ - libsqlite3-dev:$ARCH libtiff-dev:$ARCH libcurl4-openssl-dev:$ARCH \ - jq + autoconf automake libtool make cmake ccache pkg-config python3-pip sqlite3 tar zip \ + gcc-multilib g++-multilib g++ jq dpkg-dev \ + libsqlite3-dev:$ARCH \ + libtiff-dev:$ARCH \ + libcurl4-openssl-dev:$ARCH python3 -m pip install --user jsonschema export PATH=$HOME/.local/bin:$PATH diff --git a/.github/workflows/linux_gcc_5_4/start.sh b/.github/workflows/linux_gcc_5_4/start.sh index fc7abb1e..4b7088d7 100755 --- a/.github/workflows/linux_gcc_5_4/start.sh +++ b/.github/workflows/linux_gcc_5_4/start.sh @@ -6,14 +6,14 @@ export TRAVIS_OS_NAME=linux export BUILD_NAME=linux_gcc export TRAVIS_BUILD_DIR="$WORK_DIR" -apt update -y +apt-get update -y DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - autoconf automake libtool g++ sqlite3 \ - python3-pip python3-setuptools \ - make cmake ccache pkg-config tar zip \ - libsqlite3-dev libtiff-dev libcurl4-openssl-dev \ - jq lcov + autoconf automake libtool make cmake ccache pkg-config python3-pip sqlite3 tar zip \ + g++ jq lcov python3-setuptools \ + libsqlite3-dev \ + libtiff-dev \ + libcurl4-openssl-dev python3 -m pip install --user --upgrade "pip < 21.0" echo `python3 -m pip --version` |