From 4e1c06397eccaf17cd0e0dbbccd8f02992c48da9 Mon Sep 17 00:00:00 2001 From: clux Date: Mon, 23 May 2022 23:10:11 +0100 Subject: [PATCH 1/4] tmp disable ci Signed-off-by: clux --- .github/workflows/nightly.yml | 9 --------- .github/workflows/stable.yml | 9 --------- 2 files changed, 18 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index e032cae..dab2407 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -1,13 +1,4 @@ name: nightly -on: - schedule: - - cron: '0 10 * * *' # everyday at 10am - push: - branches: - - 'main' - pull_request: - branches: - - 'main' jobs: docker: diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index 81a381f..7874e9a 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -1,13 +1,4 @@ name: stable -on: - schedule: - - cron: '0 12 * * *' # everyday at noon - push: - branches: - - 'main' - pull_request: - branches: - - 'main' jobs: docker: From e483df84f273ac2a47e3599e9cf3d1d7d4c66535 Mon Sep 17 00:00:00 2001 From: clux Date: Mon, 23 May 2022 23:10:25 +0100 Subject: [PATCH 2/4] allow latest libpq Signed-off-by: clux --- Dockerfile | 2 +- update_libs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 08c8976..0b377a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,7 @@ COPY etc/profile.d/cargo.sh /etc/profile.d/cargo.sh ENV SSL_VER="1.1.1o" \ CURL_VER="7.83.1" \ ZLIB_VER="1.2.12" \ - PQ_VER="11.12" \ + PQ_VER="14.3" \ SQLITE_VER="3380500" \ CC=musl-gcc \ PREFIX=/musl \ diff --git a/update_libs.py b/update_libs.py index aabc6be..923f162 100755 --- a/update_libs.py +++ b/update_libs.py @@ -83,7 +83,7 @@ def rustup_version(): if __name__ == '__main__': PACKAGES = { 'CURL': pkgver('curl'), - #'PQ': pkgver('postgresql-old-upgrade'), # see https://github.com/clux/muslrust/issues/81 + 'PQ': pkgver('postgresql'), 'SQLITE': convert_sqlite_version(pkgver('sqlite')), 'SSL': convert_openssl_version(pkgver('openssl')), 'ZLIB': pkgver('zlib'), From 3ff63473f443e1124ba620af15e37889a931706b Mon Sep 17 00:00:00 2001 From: clux Date: Mon, 23 May 2022 23:21:48 +0100 Subject: [PATCH 3/4] use golddranks fix Signed-off-by: clux --- test/pqcrate/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/pqcrate/Cargo.toml b/test/pqcrate/Cargo.toml index 75ba625..a158fac 100644 --- a/test/pqcrate/Cargo.toml +++ b/test/pqcrate/Cargo.toml @@ -4,5 +4,6 @@ name = "pqcrate" version = "0.1.0" [dependencies] -pq-sys = "0.4.5" +#pq-sys = "0.4.5" +pq-sys = { git = "https://github.com/golddranks/pq-sys.git", rev = "8bc178b2a3859704585f4d4b39d2942c040e350b" } openssl = "*" From c688e80b75b71f1b991574ba1c75edd569b6d324 Mon Sep 17 00:00:00 2001 From: clux Date: Tue, 24 May 2022 20:39:37 +0100 Subject: [PATCH 4/4] port to main dockerfile to fix conflicts Signed-off-by: clux --- Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0b377a7..de1c119 100644 --- a/Dockerfile +++ b/Dockerfile @@ -104,6 +104,8 @@ RUN curl -sSL https://ftp.postgresql.org/pub/source/v$PQ_VER/postgresql-$PQ_VER. --without-readline \ --with-openssl \ --prefix=$PREFIX --host=x86_64-unknown-linux-musl && \ + cd src/common && make -s -j$(nproc) all && make -s install && cd ../.. && \ + cd src/port && make -s -j$(nproc) all && make -s install && cd ../.. && \ cd src/interfaces/libpq make -s -j$(nproc) all-static-lib && make -s install install-lib-static && \ cd ../../bin/pg_config && make -j $(nproc) && make install && \ cd .. && rm -rf postgresql-$PQ_VER @@ -126,11 +128,15 @@ RUN curl -sSL https://www.sqlite.org/2022/sqlite-autoconf-$SQLITE_VER.tar.gz | t # It needs the non-musl pg_config to set this up with libpq-dev (depending on libssl-dev) # See https://github.com/sgrif/pq-sys/pull/18 ENV PATH=$PREFIX/bin:$PATH \ + TARGET=x86_64_unknown_linux_musl \ + HOST=x86_64_unknown_linux_gnu \ PKG_CONFIG_ALLOW_CROSS=true \ PKG_CONFIG_ALL_STATIC=true \ PQ_LIB_STATIC_X86_64_UNKNOWN_LINUX_MUSL=true \ PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig \ + PKG_CONFIG_PATH_X86_64_UNKNOWN_LINUX_MUSL=$PREFIX/lib/pkgconfig \ PG_CONFIG_X86_64_UNKNOWN_LINUX_GNU=/usr/bin/pg_config \ + PG_CONFIG_X86_64_UNKNOWN_LINUX_MUSL=/musl/bin/pg_config \ OPENSSL_STATIC=true \ OPENSSL_DIR=$PREFIX \ SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt \