From 6e67dc2b716bb25c860cd4e172b4413ac6d26ac8 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Fri, 10 Dec 2021 15:23:55 +0100
Subject: CI: update Ubuntu 16.04 gcc 4.8 to default gcc 5.4

---
 .github/workflows/linux_gcc_4_8.yml      | 29 -----------------
 .github/workflows/linux_gcc_4_8/start.sh | 55 --------------------------------
 .github/workflows/linux_gcc_5_4.yml      | 29 +++++++++++++++++
 .github/workflows/linux_gcc_5_4/start.sh | 55 ++++++++++++++++++++++++++++++++
 4 files changed, 84 insertions(+), 84 deletions(-)
 delete mode 100644 .github/workflows/linux_gcc_4_8.yml
 delete mode 100755 .github/workflows/linux_gcc_4_8/start.sh
 create mode 100644 .github/workflows/linux_gcc_5_4.yml
 create mode 100755 .github/workflows/linux_gcc_5_4/start.sh

diff --git a/.github/workflows/linux_gcc_4_8.yml b/.github/workflows/linux_gcc_4_8.yml
deleted file mode 100644
index 1f37785c..00000000
--- a/.github/workflows/linux_gcc_4_8.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-name: Linux GCC 4.8
-
-on: [push, pull_request]
-
-jobs:
-
-  linux_gcc_4_8:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Cache
-        uses: actions/cache@v2
-        id: cache
-        with:
-          path: |
-                ${{ github.workspace }}/ccache.tar.gz
-          key: ${{ runner.os }}-cache-gcc-4-8-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-cache-gcc-4-8-
-
-      - name: Run
-        run: docker run -e CI -e WORK_DIR="$PWD" -v $PWD:$PWD ubuntu:16.04 $PWD/.github/workflows/linux_gcc_4_8/start.sh
-
-      - name: Coveralls
-        uses: coverallsapp/github-action@v1.1.2
-        with:
-            github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/linux_gcc_4_8/start.sh b/.github/workflows/linux_gcc_4_8/start.sh
deleted file mode 100755
index eb03d78d..00000000
--- a/.github/workflows/linux_gcc_4_8/start.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export TRAVIS_OS_NAME=linux
-export BUILD_NAME=linux_gcc
-export TRAVIS_BUILD_DIR="$WORK_DIR"
-
-apt update -y
-
-DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    autoconf automake libtool g++-4.8 sqlite3 \
-    python3-pip python3-setuptools \
-    make cmake ccache pkg-config tar zip \
-    libsqlite3-dev libtiff-dev libcurl4-openssl-dev \
-    jq lcov
-
-python3 -m pip install --user --upgrade "pip < 21.0"
-echo `python3 -m pip --version`
-python3 -m pip config --user set global.progress_bar off
-python3 -m pip install --user jsonschema
-python3 -m pip install --user cmake==3.9.6
-
-export PATH=$HOME/.local/bin:$PATH
-
-export CC="ccache gcc-4.8"
-export CXX="ccache g++-4.8"
-
-NPROC=$(nproc)
-echo "NPROC=${NPROC}"
-export MAKEFLAGS="-j ${NPROC}"
-
-cd "$WORK_DIR"
-
-if test -f "$WORK_DIR/ccache.tar.gz"; then
-    echo "Restoring ccache..."
-    (cd $HOME && tar xzf "$WORK_DIR/ccache.tar.gz")
-fi
-
-export CCACHE_CPP2=yes
-export PROJ_DB_CACHE_DIR="$HOME/.ccache"
-
-ccache -M 500M
-ccache -s
-
-CFLAGS="-Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" ./travis/install.sh
-
-ccache -s
-
-echo "Saving ccache..."
-rm -f "$WORK_DIR/ccache.tar.gz"
-(cd $HOME && tar czf "$WORK_DIR/ccache.tar.gz" .ccache)
-
-mkdir -p coverage
-lcov --no-external --capture --directory src --output-file coverage/lcov.info
diff --git a/.github/workflows/linux_gcc_5_4.yml b/.github/workflows/linux_gcc_5_4.yml
new file mode 100644
index 00000000..7d8744ea
--- /dev/null
+++ b/.github/workflows/linux_gcc_5_4.yml
@@ -0,0 +1,29 @@
+name: Linux GCC 5.4
+
+on: [push, pull_request]
+
+jobs:
+
+  linux_gcc_5_4:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[skip ci]')"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Cache
+        uses: actions/cache@v2
+        id: cache
+        with:
+          path: |
+                ${{ github.workspace }}/ccache.tar.gz
+          key: ${{ runner.os }}-cache-gcc-5-4-${{ github.run_id }}
+          restore-keys: ${{ runner.os }}-cache-gcc-5-4-
+
+      - name: Run
+        run: docker run -e CI -e WORK_DIR="$PWD" -v $PWD:$PWD ubuntu:16.04 $PWD/.github/workflows/linux_gcc_5_4/start.sh
+
+      - name: Coveralls
+        uses: coverallsapp/github-action@v1.1.2
+        with:
+            github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/linux_gcc_5_4/start.sh b/.github/workflows/linux_gcc_5_4/start.sh
new file mode 100755
index 00000000..1dd8e3b0
--- /dev/null
+++ b/.github/workflows/linux_gcc_5_4/start.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+set -e
+
+export TRAVIS_OS_NAME=linux
+export BUILD_NAME=linux_gcc
+export TRAVIS_BUILD_DIR="$WORK_DIR"
+
+apt 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
+
+python3 -m pip install --user --upgrade "pip < 21.0"
+echo `python3 -m pip --version`
+python3 -m pip config --user set global.progress_bar off
+python3 -m pip install --user jsonschema
+python3 -m pip install --user cmake==3.9.6
+
+export PATH=$HOME/.local/bin:$PATH
+
+export CC="ccache gcc"
+export CXX="ccache g++"
+
+NPROC=$(nproc)
+echo "NPROC=${NPROC}"
+export MAKEFLAGS="-j ${NPROC}"
+
+cd "$WORK_DIR"
+
+if test -f "$WORK_DIR/ccache.tar.gz"; then
+    echo "Restoring ccache..."
+    (cd $HOME && tar xzf "$WORK_DIR/ccache.tar.gz")
+fi
+
+export CCACHE_CPP2=yes
+export PROJ_DB_CACHE_DIR="$HOME/.ccache"
+
+ccache -M 500M
+ccache -s
+
+CFLAGS="-Werror $CFLAGS" CXXFLAGS="-Werror $CXXFLAGS" ./travis/install.sh
+
+ccache -s
+
+echo "Saving ccache..."
+rm -f "$WORK_DIR/ccache.tar.gz"
+(cd $HOME && tar czf "$WORK_DIR/ccache.tar.gz" .ccache)
+
+mkdir -p coverage
+lcov --no-external --capture --directory src --output-file coverage/lcov.info
-- 
cgit v1.2.3