Merge remote-tracking branch 'upstream/pmp-p/dbg-sockfiles'

pmp-p · Aug 25, 2024 · a17a38e · a17a38e
2 parents 3281c27 + fd053cc
commit a17a38e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.buildconfig b/.buildconfig
@@ -1,2 +1,2 @@
 PG_VERSION=16.4
-SDK_VERSION=3.1.65.12bi
+SDK_VERSION=3.1.66.1bi
diff --git a/cibuild.sh b/cibuild.sh
@@ -4,8 +4,13 @@
 # expressed in EMSDK MB
 export CMA_MB=${CMA_MB:-64}
 
-export PG_VERSION=${PG_VERSION:-16.4}
 export CI=${CI:-false}
+if $CI
+then
+    . .buildconfig
+fi
+
+export PG_VERSION=${PG_VERSION:-16.4}
 export WORKSPACE=${GITHUB_WORKSPACE:-$(pwd)}
 export PGROOT=${PGROOT:-/tmp/pglite}
 export WEBROOT=${WEBROOT:-/tmp/web}

diff --git a/cibuild/pglite-ts.sh b/cibuild/pglite-ts.sh
diff --git a/patches/postgresql-emscripten/src-include-port-emscripten.h.diff b/patches/postgresql-emscripten/src-include-port-emscripten.h.diff
@@ -1,6 +1,6 @@
 --- postgresql/src/include/port/emscripten.h
 +++ postgresql-wasm/src/include/port/emscripten.h
-@@ -0,0 +1,329 @@
+@@ -0,0 +1,334 @@
 +/* src/include/port/emscripten.h */
 +
 +#ifndef I_EMSCRIPTEN