Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

neon-* 4642 #102

Closed
wants to merge 4 commits into from
Closed

neon-* 4642 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e42f06
neon-extension 4642
bayandin Jan 24, 2024
f71b8e5
neon-local 4642
bayandin Jan 24, 2024
9aa90e0
neon-postgres 4642
bayandin Jan 24, 2024
22ed198
neon-storage 4642
bayandin Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Formula/neon-extension.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-4604",
revision: "93450f11f5f34a1e7435d9e73727f38036b92457"
tag: "release-4642",
revision: "a1a74eef2c60c283bc038b65b99db2ed0c68f5bb"
license "Apache-2.0"
head "https://github.com/neondatabase/neon.git", branch: "main"

Expand Down
4 changes: 2 additions & 2 deletions Formula/neon-local.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-4604",
revision: "93450f11f5f34a1e7435d9e73727f38036b92457"
tag: "release-4642",
revision: "a1a74eef2c60c283bc038b65b99db2ed0c68f5bb"
license "Apache-2.0"
head "https://github.com/neondatabase/neon.git", branch: "main"

Expand Down
12 changes: 9 additions & 3 deletions Formula/neon-postgres.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-4604",
revision: "93450f11f5f34a1e7435d9e73727f38036b92457"
tag: "release-4642",
revision: "a1a74eef2c60c283bc038b65b99db2ed0c68f5bb"
license "Apache-2.0"
head "https://github.com/neondatabase/neon.git", branch: "main"

Expand All @@ -25,11 +25,17 @@ class NeonPostgres < Formula

uses_from_macos "bison" => :build
uses_from_macos "flex" => :build
uses_from_macos "curl"
uses_from_macos "libxml2"
uses_from_macos "libxslt"

# A workaround for `FATAL: postmaster became multithreaded during startup` on macOS >= 14.2
# See https://www.postgresql.org/message-id/flat/CYMBV0OT7216.JNRUO6R6GH86%40neon.tech
on_macos do
depends_on "bayandin/tap/curl-without-ipv6"
end

on_linux do
depends_on "curl"
depends_on "libseccomp"
end

Expand Down
19 changes: 15 additions & 4 deletions Formula/neon-storage.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-4604",
revision: "93450f11f5f34a1e7435d9e73727f38036b92457"
tag: "release-4642",
revision: "a1a74eef2c60c283bc038b65b99db2ed0c68f5bb"
license "Apache-2.0"
head "https://github.com/neondatabase/neon.git", branch: "main"

Expand All @@ -24,8 +24,8 @@ class NeonStorage < Formula

def binaries
%w[
compute_ctl neon_local pagebench pagectl
pageserver pg_sni_router proxy s3_scrubber
attachment_service compute_ctl neon_local pagebench
pagectl pageserver pg_sni_router proxy s3_scrubber
safekeeper storage_broker trace wal_craft
]
end
Expand All @@ -38,9 +38,20 @@ def install
ENV["BUILD_TAG"] = build.stable? ? "release-#{version}" : "dev-#{Utils.git_short_head}"
ENV["GIT_VERSION"] = Utils.git_head

# A workaround for `FATAL: postmaster became multithreaded during startup` on macOS >= 14.2
# See https://www.postgresql.org/message-id/flat/CYMBV0OT7216.JNRUO6R6GH86%40neon.tech
if OS.mac?
inreplace "control_plane/src/endpoint.rs", "cmd.args([\"--http-port\", &self.http_address.port().to_string()])",
<<~EOS
cmd.args(["--http-port", &self.http_address.port().to_string()])
.env("DYLD_LIBRARY_PATH", "#{Formula["bayandin/tap/curl-without-ipv6"].opt_lib}")
EOS
end

with_env(POSTGRES_INSTALL_DIR: neon_postgres.opt_libexec) do
system "cargo", "install", *std_cargo_args(root: libexec, path: "compute_tools")
system "cargo", "install", *std_cargo_args(root: libexec, path: "control_plane")
system "cargo", "install", *std_cargo_args(root: libexec, path: "control_plane/attachment_service")
system "cargo", "install", *std_cargo_args(root: libexec, path: "libs/postgres_ffi/wal_craft")
system "cargo", "install", *std_cargo_args(root: libexec, path: "pageserver")
system "cargo", "install", *std_cargo_args(root: libexec, path: "pageserver/ctl")
Expand Down
Loading