From 347729f665cf8557d6d7d6aef965757d6b7ace8a Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Wed, 13 Sep 2023 12:48:51 +0100 Subject: [PATCH 1/4] neon-extension 3909 --- Formula/neon-extension.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Formula/neon-extension.rb b/Formula/neon-extension.rb index cea93de..c62890d 100644 --- a/Formula/neon-extension.rb +++ b/Formula/neon-extension.rb @@ -2,8 +2,8 @@ class NeonExtension < Formula desc "Extension enabling storage manager API and Pageserver communication" homepage "https://github.com/neondatabase/neon" url "https://github.com/neondatabase/neon.git", - tag: "release-3898", - revision: "0e6fdc8a587aacbc598afb9232eb81484ed3494e" + tag: "release-3909", + revision: "7d6ec1616610bc665e19a86843dc0f08f63fc922" license "Apache-2.0" head "https://github.com/neondatabase/neon.git", branch: "main" @@ -25,7 +25,7 @@ def neon_postgres end def install - neon_postgres.pg_versions.each do |v| + neon_postgres.pg_versions_internal.each do |v| extensions.each do |ext| cp_r "pgxn/#{ext}", "build-#{ext}-#{v}" cd "build-#{ext}-#{v}" do @@ -40,7 +40,7 @@ def install end test do - neon_postgres.pg_versions.each do |v| + neon_postgres.pg_versions_internal.each do |v| pg_ctl = neon_postgres.pg_bin_for(v)/"pg_ctl" psql = neon_postgres.pg_bin_for(v)/"psql" port = free_port From 814d1f75f6a7e6888a637b3c85c29cf02df4c5b9 Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Wed, 13 Sep 2023 12:48:59 +0100 Subject: [PATCH 2/4] neon-local 3909 --- Formula/neon-local.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Formula/neon-local.rb b/Formula/neon-local.rb index 1c680cd..c1f88fd 100644 --- a/Formula/neon-local.rb +++ b/Formula/neon-local.rb @@ -2,8 +2,8 @@ class NeonLocal < Formula desc "CLI for running Neon locally" homepage "https://github.com/neondatabase/neon" url "https://github.com/neondatabase/neon.git", - tag: "release-3898", - revision: "0e6fdc8a587aacbc598afb9232eb81484ed3494e" + tag: "release-3909", + revision: "7d6ec1616610bc665e19a86843dc0f08f63fc922" license "Apache-2.0" head "https://github.com/neondatabase/neon.git", branch: "main" @@ -76,7 +76,7 @@ def post_install end system bin/"neon_local", "start" - neon_postgres.pg_versions.each do |v| + neon_postgres.pg_versions_internal.each do |v| vv = v.delete_prefix("v") output = shell_output("#{bin}/neon_local tenant create --pg-version #{vv}") From 9f1dd7f570d55ba74e97b0a78737f1e4ad636cb7 Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Wed, 13 Sep 2023 12:49:18 +0100 Subject: [PATCH 3/4] neon-postgres 3909 --- Formula/neon-postgres.rb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/Formula/neon-postgres.rb b/Formula/neon-postgres.rb index faa839a..36a9b46 100644 --- a/Formula/neon-postgres.rb +++ b/Formula/neon-postgres.rb @@ -2,8 +2,8 @@ class NeonPostgres < Formula desc "Neon's fork of PostgreSQL" homepage "https://github.com/neondatabase/postgres" url "https://github.com/neondatabase/neon.git", - tag: "release-3898", - revision: "0e6fdc8a587aacbc598afb9232eb81484ed3494e" + tag: "release-3909", + revision: "7d6ec1616610bc665e19a86843dc0f08f63fc922" license "Apache-2.0" head "https://github.com/neondatabase/neon.git", branch: "main" @@ -31,12 +31,16 @@ class NeonPostgres < Formula depends_on "libseccomp" end + def pg_versions_internal + %w[v14 v15 v16] + end + def pg_versions %w[v14 v15] end def pg_bin_for(version) - pg_versions.to_h { |v| [v, opt_libexec/v/"bin"] }.fetch(version) + pg_versions_internal.to_h { |v| [v, opt_libexec/v/"bin"] }.fetch(version) end def install @@ -50,7 +54,7 @@ def install ENV.prepend "CPPFLAGS", "-I#{Formula["curl"].opt_include}" end - pg_versions.each do |v| + pg_versions_internal.each do |v| cd "vendor/postgres-#{v}" do args = %W[ --prefix=#{libexec}/#{v} @@ -92,7 +96,7 @@ def install end test do - pg_versions.each do |v| + pg_versions_internal.each do |v| system "#{pg_bin_for(v)}/initdb", testpath/"test-#{v}" pg_config = pg_bin_for(v)/"pg_config" From e6db0d65595776151270155b20785a63b95c2eff Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Wed, 13 Sep 2023 12:49:31 +0100 Subject: [PATCH 4/4] neon-storage 3909 --- Formula/neon-storage.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Formula/neon-storage.rb b/Formula/neon-storage.rb index 3b59a3b..a15db77 100644 --- a/Formula/neon-storage.rb +++ b/Formula/neon-storage.rb @@ -2,8 +2,8 @@ class NeonStorage < Formula desc "Storage components for Neon" homepage "https://github.com/neondatabase/neon" url "https://github.com/neondatabase/neon.git", - tag: "release-3898", - revision: "0e6fdc8a587aacbc598afb9232eb81484ed3494e" + tag: "release-3909", + revision: "7d6ec1616610bc665e19a86843dc0f08f63fc922" license "Apache-2.0" head "https://github.com/neondatabase/neon.git", branch: "main"