Merge branch 'ci-update'

Update CI to use newer build systems.

See SOCI#1007.

Author: vadz

.github/workflows/ci.yml

@@ -22,7 +22,7 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ matrix.runner || 'ubuntu-18.04' }}
+    runs-on: ${{ matrix.runner || 'ubuntu-22.04' }}
     name: ${{ matrix.name }}
     strategy:
       fail-fast: false
@@ -31,18 +31,16 @@ jobs:
           # Note: the jobs are ordered in the order of decreasing running
           # time, as this should minimize the total run-time of all jobs.
           - backend: postgresql
-            runner: macos-10.15
+            runner: macos-11
             name: PostgreSQL macOS
           - backend: oracle
             name: Oracle 11
             no_boost: true
           - backend: valgrind
-            # This one dies under Xenial due to a bug in Valgrind and reports
-            # errors under Focal in MySQL test, so run it under Bionic where
-            # it just happens to work.
-            runner: ubuntu-18.04
             name: Valgrind
           - backend: odbc
+            # There are many leak reports under Ubuntu 22.04, see #1008.
+            runner: ubuntu-18.04
             name: ODBC
           - backend: firebird
             name: Firebird
@@ -51,12 +49,12 @@ jobs:
           - backend: mysql
             name: MySQL
           - backend: sqlite3
-            runner: macos-10.15
+            runner: macos-11
             name: SQLite3 macOS
           - backend: sqlite3
             name: SQLite3
           - backend: empty
-            runner: macos-10.15
+            runner: macos-11
             name: Empty macOS
           - backend: empty
             name: Empty
@@ -77,7 +75,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set environment variables
         run: |
@@ -114,8 +112,6 @@ jobs:
 
       - name: Install dependencies under Linux
         if: runner.os == 'Linux'
-        env:
-          SOCI_CI_PACKAGES: cmake
         run: ./scripts/ci/install.sh
 
       - name: Prepare for build

.github/workflows/codeql.yml

@@ -30,10 +30,10 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: cpp
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -51,8 +51,6 @@ jobs:
         set_env_var SOCI_SOURCE_DIR $GITHUB_WORKSPACE
 
     - name: Install dependencies
-      env:
-        SOCI_CI_PACKAGES: cmake
       run: ./scripts/ci/install.sh
 
     - name: Prepare for build
@@ -62,4 +60,4 @@ jobs:
       run: ./scripts/ci/build.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

scripts/ci/before_build_mysql.sh

@@ -17,5 +17,8 @@ mysql --version
 mysql -u root ${SOCI_MYSQL_PASSWORD_OPT} -e "CREATE DATABASE soci_test;"
 mysql -u root ${SOCI_MYSQL_PASSWORD_OPT} -e "GRANT ALL PRIVILEGES ON soci_test.* TO '${SOCI_MYSQL_USER}'@'%';";
 
+# This is necessary for MySQL stored procedure unit test to work.
+mysql -u root ${SOCI_MYSQL_PASSWORD_OPT} -e "SET GLOBAL log_bin_trust_function_creators=1";
+
 echo 'Testing connection to the database:'
 echo 'SELECT USER();' | mysql --database=soci_test

scripts/ci/build_empty.sh

@@ -30,8 +30,8 @@ fi
 if [[ "$TEST_RELEASE_PACKAGE" == "YES" ]] && [[ "$SOCI_CI_BRANCH" =~ ^release/[3-9]\.[0-9]$ ]]; then
     ME=`basename "$0"`
 
-    sudo apt-get update -qq -y
-    sudo apt-get install -qq -y python3-venv
+    run_apt update
+    run_apt install python3-venv
 
     SOCI_VERSION=$(cat "$SOCI_SOURCE_DIR/include/soci/version.h" | grep -Po "(.*#define\s+SOCI_LIB_VERSION\s+.+)\K([3-9]_[0-9]_[0-9])" | sed "s/_/\./g")
     if [[ ! "$SOCI_VERSION" =~ ^[4-9]\.[0-9]\.[0-9]$ ]]; then

scripts/ci/common.sh

@@ -1,20 +1,23 @@
-#!/usr/bin/env bash
+#!/bin/sh
 # Common definitions used by SOCI build scripts in CI builds
 #
 # Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
 #
+# Note that this is a /bin/sh script because it is used from install.sh
+# which installs bash under FreeBSD and so we can't rely on bash being
+# available yet.
 
 # Stop on all errors.
 set -e
 
-if [[ "$SOCI_CI" != "true" ]] ; then
+if [ "$SOCI_CI" != "true" ] ; then
 	echo "Running this script is only useful in the CI builds"
 	exit 1
 fi
 
 backend_settings=${SOCI_SOURCE_DIR}/scripts/ci/${SOCI_CI_BACKEND}.sh
 if [ -f ${backend_settings} ]; then
-    source ${backend_settings}
+    . ${backend_settings}
 fi
 
 #
@@ -33,10 +36,6 @@ case `uname` in
         num_cpus=1
 esac
 
-if [[ ${num_cpus} != 1 ]]; then
-    ((num_cpus++))
-fi
-
 # Directory where the build happens.
 #
 # Note that the existing commands suppose that the build directory is an
@@ -52,7 +51,7 @@ SOCI_COMMON_CMAKE_OPTIONS='
     -DSOCI_TESTS=ON
 '
 
-if [[ -n ${WITH_BOOST} ]]; then
+if [ -n "${WITH_BOOST}" ]; then
     SOCI_COMMON_CMAKE_OPTIONS="$SOCI_COMMON_CMAKE_OPTIONS -DWITH_BOOST=${WITH_BOOST}"
 fi
 
@@ -77,6 +76,12 @@ tmstamp()
     echo -n "[$(date '+%H:%M:%S')]" ;
 }
 
+run_apt()
+{
+    # Disable some (but not all) output.
+    sudo apt-get -q -y -o=Dpkg::Use-Pty=0 "$@"
+}
+
 run_make()
 {
     make -j $num_cpus
@@ -86,7 +91,7 @@ run_test()
 {
     # The example project doesn't have any tests, but otherwise their absence
     # is an error and means that something has gone wrong.
-    if [[ "$BUILD_EXAMPLES" == "YES" ]]; then
+    if [ "$BUILD_EXAMPLES" == "YES" ]; then
         no_tests_action=ignore
     else
         no_tests_action=error

scripts/ci/install.sh

@@ -3,17 +3,22 @@
 #
 # Copyright (c) 2013 Mateusz Loskot <mateusz@loskot.net>
 #
-# Note that this is a /bin/sh script because it runs to install bash under
-# FreeBSD and so does not include common.sh, which uses bash.
-set -e
+# Note that this is a /bin/sh script because bash is not installed yet under
+# FreeBSD.
+. ${SOCI_SOURCE_DIR}/scripts/ci/common.sh
 
 case "$(uname)" in
     Linux)
-        packages_to_install="${SOCI_CI_PACKAGES} libc6-dbg"
+        packages_to_install="cmake libc6-dbg"
         if [ "${WITH_BOOST}" != OFF ]; then
             packages_to_install="$packages_to_install  libboost-dev libboost-date-time-dev"
         fi
 
+        # Get rid of the repositories that we don't need: not only this takes
+        # extra time to update, but it also often fails with "Mirror sync in
+        # progress" errors.
+        for apt_file in `grep -lr microsoft /etc/apt/sources.list.d/`; do sudo rm $apt_file; done
+
         codename=$(lsb_release --codename --short)
         # Enable the `-dbgsym` repositories.
         echo "deb http://ddebs.ubuntu.com ${codename} main restricted universe multiverse
@@ -22,10 +27,10 @@ case "$(uname)" in
 
         # Import the debug symbol archive signing key from the Ubuntu server.
         # Note that this command works only on Ubuntu 18.04 LTS and newer.
-        sudo apt-get install -qq -y ubuntu-dbgsym-keyring
+        run_apt install ubuntu-dbgsym-keyring
 
-        sudo apt-get update -qq -y
-        sudo apt-get install -qq -y ${packages_to_install}
+        run_apt update
+        run_apt install ${packages_to_install}
         ;;
 
     FreeBSD)

scripts/ci/install_db2.sh

@@ -6,8 +6,8 @@
 #
 set -e
 sudo bash -c 'echo "deb http://archive.canonical.com/ubuntu precise partner" >> /etc/apt/sources.list'
-sudo apt-get update -qq -y
-sudo apt-get install -qq -y db2exc
+run_apt update
+run_apt install db2exc
 
 echo "Running db2profile and db2rmln"
 sudo /bin/sh -c '. ~db2inst1/sqllib/db2profile ; $DB2DIR/cfg/db2rmln'

scripts/ci/install_firebird.sh

@@ -5,7 +5,8 @@
 #
 source ${SOCI_SOURCE_DIR}/scripts/ci/common.sh
 
-case $(lsb_release -sc) in
+codename=$(lsb_release -sc)
+case "$codename" in
     trusty | xenial)
         firebird_version=2.5
         firebird_server_package=firebird2.5-super
@@ -17,18 +18,18 @@ EOF
 )
         ;;
 
-    focal | bionic)
+    jammy | focal | bionic)
         firebird_version=3.0
         firebird_server_package=firebird3.0-server
         firebird_server_service=firebird3.0
         ;;
 
     *)
-        echo "*** Can't install Firebird: unknown Ubuntu version! ***"
+        echo "*** Can't install Firebird: unknown Ubuntu version $codename! ***"
         exit 1
 esac
 
-sudo apt-get install -qq expect ${firebird_server_package} firebird-dev
+run_apt install expect ${firebird_server_package} firebird-dev
 
 # Default frontend is "noninteractive", which prevents dpkg-reconfigure from
 # asking anything at all, so change it. Notice that we must do it via

scripts/ci/install_odbc.sh

@@ -5,7 +5,7 @@
 #
 source ${SOCI_SOURCE_DIR}/scripts/ci/common.sh
 
-sudo apt-get install -qq \
+run_apt install \
     tar bzip2 \
     unixodbc unixodbc-dev \
     odbc-postgresql odbc-postgresql-dbgsym

scripts/ci/install_valgrind.sh

@@ -5,4 +5,4 @@
 #
 source ${SOCI_SOURCE_DIR}/scripts/ci/common.sh
 
-sudo apt-get install -qq valgrind
+run_apt install valgrind