Skip to content

Try Postgres 17 on Windows #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 20 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
277 changes: 0 additions & 277 deletions .github/workflows/haskell-ci.yml

This file was deleted.

24 changes: 21 additions & 3 deletions .github/workflows/simple.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ jobs:
matrix:
os: [macos-latest, windows-latest]
# Older GHCs need LLVM on macos-latest (ARM)
ghc: ['9.2','9.4.8','9.6.6','9.8.2','9.10.1']
ghc: ['9.10.2']
psql: ['16', '17']
fail-fast: false
timeout-minutes:
60
Expand All @@ -33,17 +34,34 @@ jobs:
cabal-version: '3.10.2.0'

- name: Set up PostgreSQL
uses: ikalnytskyi/action-setup-postgres@v6
uses: ikalnytskyi/action-setup-postgres@v7
id: postgres
with:
username: ci
password: sw0rdfish
database: test
postgres-version: "14"
postgres-version: ${{ matrix.psql }}

- name: Debug
shell: bash
run: |
ls c:/progra~1/postgr~1/ || true
ls c:/progra~1/postgr~1/16 || true
ls c:/progra~1/postgr~1/17 || true
ls c:/progra~1/postgr~1/16/lib || true
ls c:/progra~1/postgr~1/17/lib || true

- name: Checkout
uses: actions/checkout@v4

- name: More debug
run:
gcc -o smalltest -IC:/PROGRA~1/POSTGR~1/${{ matrix.psql }}/include -LC:/PROGRA~1/POSTGR~1/${{ matrix.psql }}/lib small.c -lpq

- name: More debug
run:
C:\ghcup\ghc\910~1.2\lib/../mingw//bin\clang.exe -o smalltest -IC:/PROGRA~1/POSTGR~1/${{ matrix.psql }}/include -LC:/PROGRA~1/POSTGR~1/${{ matrix.psql }}/lib small.c -lpq

- name: Cache
uses: actions/cache@v4
with:
Expand Down
5 changes: 5 additions & 0 deletions postgresql-libpq-configure/configure
Original file line number Diff line number Diff line change
Expand Up @@ -1535,6 +1535,9 @@ case "(($ac_try" in
esac
eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
printf "%s\n" "$ac_try_echo"; } >&5
echo "$ac_link"
echo "$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS"
(eval "$ac_link") || true
(eval "$ac_link") 2>conftest.err
ac_status=$?
if test -s conftest.err; then
Expand Down Expand Up @@ -3987,6 +3990,8 @@ then :
break
fi

$PG_CONFIG

found_postgresql="yes"
break
done
Expand Down
2 changes: 2 additions & 0 deletions postgresql-libpq-configure/m4/ax_lib_postgresql.m4
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ AC_DEFUN([_AX_LIB_POSTGRESQL_OLD],[
])
AS_IF([test "X$found_postgresql_req_version" = "Xno"],[break])

$PG_CONFIG

found_postgresql="yes"
break
done
Expand Down
7 changes: 7 additions & 0 deletions small.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#include <libpq-fe.h>

int main() {
char conninfo[]="dbname = postgres";
PGconn *conn;
conn = PQconnectdb(conninfo);
}
Loading