Set postgres to exact version that gets bundled.

gz · gz · commit 64a84dea976d · 2025-06-16T00:48:11.000Z
Signed-off-by: Gerd Zellweger &lt;mail@gerdzellweger.com&gt;
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,2 +1,8 @@
 [env]
-POSTGRESQL_VERSION = "15"
+# PostgreSQL version that gets bundled with `postgresql_embedded`
+#
+# - This needs refer to the exact version that is downloaded by
+#   postgresql_embedded bundle step (e.g. not omit minor or bugfix)
+# - Also note that we can't change the major version without making sure
+#   the database directories in ~/.feldera for users get upgraded too.
+POSTGRESQL_VERSION = "15.13.0"
diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
@@ -23,7 +23,7 @@ jobs:
             --health-timeout=5s \
             --health-retries=5 \
             ${{ vars.FELDERA_IMAGE_NAME }}:sha-${{ github.sha }}
-      - name: Wait for container to become healthy (max 10s)
+      - name: Wait for container to become healthy (max 50s)
         run: |
           for i in {1..50}; do
             status=$(docker inspect --format '{{json .State.Health}}' pipeline-manager-no-internet | jq -r .Status 2>/dev/null || echo "starting")
@@ -39,10 +39,10 @@ jobs:
           done
           echo "Timed out waiting for pipeline-manager to become healthy"
           exit 1
-      - name: Cleanup
+      - name: Logs & Cleanup
         if: always()
         run: |
-          docker logs pipeline-manager-no-internet
+          docker logs pipeline-manager-no-internet || true
           docker rm -f pipeline-manager-no-internet || true
           docker network rm no-internet-net || true
 
diff --git a/crates/pipeline-manager/src/db/pg_setup.rs b/crates/pipeline-manager/src/db/pg_setup.rs
@@ -25,15 +25,15 @@ pub(crate) async fn install(
     persistent: bool,
     port: Option<u16>,
 ) -> Result<PostgreSQL, PostgreSQLError> {
-    let mut pg_settings = PostgreSQLSettings::default();
-    pg_settings.data_dir = database_dir;
-    pg_settings.username = "postgres".to_string();
-    pg_settings.password = "postgres".to_string();
-    // Set to v15 in build.rs, note that we can't change/upgrade this without making
-    // sure the database directories in ~/.feldera get upgraded too.
-    pg_settings.version = VersionReq::from_str(env!("POSTGRESQL_VERSION"))?;
-    pg_settings.temporary = !persistent;
-    pg_settings.port = port.unwrap_or(5432);
+    let pg_settings = PostgreSQLSettings {
+        data_dir: database_dir,
+        username: "postgres".to_string(),
+        password: "postgres".to_string(),
+        version: VersionReq::from_str(format!("={}", env!("POSTGRESQL_VERSION")).as_str())?,
+        temporary: !persistent,
+        port: port.unwrap_or(5432),
+        ..Default::default()
+    };
 
     let mut postgresql = PostgreSQL::new(pg_settings);
     postgresql.setup().await?;
