more debugging

Author: davecramer

.github/workflows/linux.yml

@@ -36,6 +36,18 @@ jobs:
           build-essential autoconf automake libtool \
           libpq-dev unixodbc-dev unixodbc \
           postgresql postgresql-client
+        if ! command -v odbc_config >/dev/null 2>&1; then
+          sudo tee /usr/local/bin/odbc_config > /dev/null <<'EOF'
+        #!/bin/sh
+        case $1 in
+        	--include-prefix) echo "/usr/include" ;;
+        	--lib-prefix) echo "/usr/lib" ;;
+        	--libs) echo "-lodbc" ;;
+        	*) echo "$0: unknown argument '$1'"; exit 1 ;;
+        esac
+        EOF
+          sudo chmod +x /usr/local/bin/odbc_config
+        fi
 
     - name: Install dependencies (Fedora)
       if: matrix.container == 'fedora:latest'
@@ -54,30 +66,28 @@ jobs:
     - name: Configure
       run: |
         PG_CONFIG=$(find /usr -name pg_config -type f 2>/dev/null | head -1)
-        CONFIGURE_ARGS=""
-        if ! command -v odbc_config >/dev/null 2>&1; then
-          CONFIGURE_ARGS="--with-unixodbc=/usr"
-        fi
         if [ -n "$PG_CONFIG" ]; then
-          CONFIGURE_ARGS="$CONFIGURE_ARGS --with-libpq=$PG_CONFIG"
+          export PATH="$(dirname $PG_CONFIG):$PATH"
         fi
-        ./configure $CONFIGURE_ARGS
+        ./configure
 
     - name: Build
       run: make -j$(nproc)
 
     - name: Start PostgreSQL (Debian)
       if: matrix.container == ''
       run: |
+        sudo mkdir -p /var/run/postgresql
+        sudo chown postgres:postgres /var/run/postgresql
         sudo pg_ctlcluster $(pg_lsclusters -h | head -1 | awk '{print $1, $2}') start
         sudo -u postgres createuser -s runner
         sudo -u postgres createdb contrib_regression
 
     - name: Start PostgreSQL (Fedora)
       if: matrix.container == 'fedora:latest'
       run: |
-        mkdir -p /var/lib/pgsql/data
-        chown postgres:postgres /var/lib/pgsql/data
+        mkdir -p /var/lib/pgsql/data /var/run/postgresql
+        chown postgres:postgres /var/lib/pgsql/data /var/run/postgresql
         su postgres -c 'initdb -D /var/lib/pgsql/data' || { echo "initdb failed"; exit 1; }
         su postgres -c "sed -i 's/^logging_collector = on/logging_collector = off/' /var/lib/pgsql/data/postgresql.conf"
         su postgres -c 'pg_ctl -D /var/lib/pgsql/data -l /tmp/pg.log -t 30 start' || { cat /tmp/pg.log; exit 1; }