From fc38b22e10dbf70471af6093838d9357f5cf5816 Mon Sep 17 00:00:00 2001 From: LuRy Date: Mon, 4 May 2026 13:37:36 +0200 Subject: [PATCH] fix(postgresql): trim windows runtime package --- .github/workflows/build-postgresql.yml | 14 +++++++++++--- README.md | 4 ++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-postgresql.yml b/.github/workflows/build-postgresql.yml index 558349c..76d7105 100644 --- a/.github/workflows/build-postgresql.yml +++ b/.github/workflows/build-postgresql.yml @@ -35,7 +35,7 @@ jobs: } "version=$version" | Out-File $env:GITHUB_OUTPUT -Append - - name: Download EnterpriseDB Windows binaries + - name: Download and stage EnterpriseDB Windows runtime shell: pwsh run: | $version = '${{ steps.ver.outputs.version }}' @@ -45,10 +45,18 @@ jobs: $root = Get-ChildItem upstream -Directory | Select-Object -First 1 if (-not $root) { throw 'PostgreSQL zip did not contain a root directory' } New-Item -ItemType Directory -Path stage -Force | Out-Null - Copy-Item -Path (Join-Path $root.FullName '*') -Destination stage -Recurse -Force + foreach ($dir in @('bin', 'lib', 'share', 'include')) { + $src = Join-Path $root.FullName $dir + if (-not (Test-Path $src)) { throw "Missing upstream $dir directory" } + Copy-Item -Path $src -Destination stage -Recurse -Force + } + Remove-Item -Path (Join-Path $PWD 'stage/bin/stackbuilder.exe') -Force -ErrorAction SilentlyContinue + Remove-Item -Path (Join-Path $PWD 'stage/bin/wx*.dll') -Force -ErrorAction SilentlyContinue + Remove-Item -Path (Join-Path $PWD 'stage/bin/test*.exe') -Force -ErrorAction SilentlyContinue $version | Out-File stage/VERSION -Encoding ascii if (-not (Test-Path stage/bin/postgres.exe)) { throw 'Missing stage/bin/postgres.exe' } if (-not (Test-Path stage/bin/initdb.exe)) { throw 'Missing stage/bin/initdb.exe' } + if (Test-Path 'stage/pgAdmin 4') { throw 'pgAdmin must not be packaged' } - name: Smoke test PostgreSQL shell: pwsh @@ -86,7 +94,7 @@ jobs: body: | PostgreSQL ${{ steps.ver.outputs.version }} binaries for NKS WebDev Console's `wdc binaries install postgresql@${{ steps.ver.outputs.version }}` flow. - Windows x64 is repackaged from EnterpriseDB's official PostgreSQL binaries ZIP. Linux x64 and macOS arm64 assets, if present, are built from official PostgreSQL source and smoke-tested with initdb, pg_ctl, pg_isready, createdb, psql, pg_dump, and clean shutdown. + Windows x64 is a runtime-only package staged from EnterpriseDB's official PostgreSQL binaries ZIP. Linux x64 and macOS arm64 assets, if present, are built from official PostgreSQL source and smoke-tested with initdb, pg_ctl, pg_isready, createdb, psql, pg_dump, and clean shutdown. files: postgresql-${{ steps.ver.outputs.version }}-windows-x64.zip fail_on_unmatched_files: true env: diff --git a/README.md b/README.md index c357c3d..f0e9bc3 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Public binary releases for [NKS WebDev Console](https://github.com/nks-hub/webde - ✅ **PHP 5.6 → 8.5** — twelve minor versions with comprehensive extension set (opcache, gd, intl, pdo_mysql/pgsql/sqlite, ldap, gettext, tidy, sodium, …) plus PECL: apcu, redis, xdebug, imagick, mongodb, swoole, memcached, igbinary, yaml, oauth, imap - ✅ **Apache 2.4** — full module catalog: mod_md (ACME / Let's Encrypt), mod_remoteip, http2, brotli, dav, cache, lua, ratelimit, session_crypto, socache_redis… - ✅ **MariaDB + MySQL** — official upstream mirrors plus source-built macOS arm64 (upstream doesn't ship arm64 pre-built tarballs) -- ✅ **PostgreSQL** — Windows binaries from EnterpriseDB, Linux/macOS source builds with initdb/start/query/dump smoke tests +- ✅ **PostgreSQL** — runtime-only Windows package from EnterpriseDB binaries, Linux/macOS source builds with initdb/start/query/dump smoke tests - ✅ **Nginx, Caddy** — modern web server alternatives with HTTP/2 + HTTP/3 support - ✅ **Redis** — TLS-enabled source build for Linux + macOS, community fork mirror for Windows - ✅ **mkcert + cloudflared** — local CA + Cloudflare Tunnel daemon mirrors @@ -76,7 +76,7 @@ curl -L -o php.tar.xz \ | `binaries-nginx-` | Win x64, macOS arm64, Linux x64 | source on Linux/Mac, nginx.org on Win | | `binaries-mariadb-` | Win x64, Linux x64, macOS arm64 | upstream mirror + brew-bottle relocated macOS | | `binaries-mysql-` | Win x64, Linux x64, macOS arm64 | dev.mysql.com mirror + brew-bottle relocated | -| `binaries-postgresql-` | Win x64, Linux x64, macOS arm64 | EnterpriseDB Windows ZIP + source Linux/macOS | +| `binaries-postgresql-` | Win x64, Linux x64, macOS arm64 | EnterpriseDB runtime subset + source Linux/macOS | | `binaries-redis-` | Win x64, macOS arm64, Linux x64 | source with TLS on Linux/Mac, fork on Win | | `binaries-mkcert-` | Win x64, macOS arm64, Linux x64 | mirror of FiloSottile/mkcert | | `binaries-caddy-` | Win x64, macOS arm64, Linux x64 | mirror of caddyserver/caddy |