Merge branch 'master' into deb

qount25 · qount25 · commit 6b562079308a · 2025-03-17T18:45:02.000Z
diff --git a/README.md b/README.md
@@ -166,3 +166,15 @@ docker rmi pgpm:local
 docker rmi ghcr.io/postgres-pm/pgpm:latest
 ```
 
+### Troubleshooting
+
+#### Podman invocations terminate with exit code 137
+
+Make sure your machine has enough RAM. For `podman-machine` you might want to adjust it
+with
+
+```shell
+podman machine stop
+podman machine set -m 16384 # for 16GB
+podman machine start
+```
diff --git a/exe/pgpm b/exe/pgpm
@@ -41,6 +41,22 @@ module Pgpm
         option :path, type: :path, desc: "Override path to the source"
         argument :packages, type: :array, required: true, desc: "Package names"
 
+        module ExtendedProc
+          refine Proc do
+            def and_then(callable)
+              lambda do |*args|
+                res1 = call(*args)
+                res2 = callable.call(*args)
+                return res1 + res2 if res1.is_a?(Array) && res2.is_a?(Array)
+
+                res2
+              end
+            end
+          end
+        end
+
+        using ExtendedProc
+
         # rubocop:disable Metrics/ParameterLists:
         def call(packages:, args: nil, os: nil, arch: nil, pgdist: nil, pgver: nil, pkgdir: nil, path: nil)
           _ = args
@@ -109,6 +125,10 @@ module Pgpm
             os.with_scope do
               arch.with_scope do
                 selected_pgdist.with_scope do
+                  pkgs = pkgs.flat_map do |pkg|
+                    [pkg, *pkg.all_requirements]
+                  end.reject(&:contrib?)
+
                   b = pkgs.reduce(nil) do |c, p|
                     if p.broken?
                       puts "Can't build a broken package #{p.name}@#{p.version}"
@@ -123,15 +143,14 @@ module Pgpm
                   end
 
                   srpms = b.call
-                  Pgpm::RedHat::Builder.builder(srpms).call
+                  Pgpm::RPM::Builder.builder(srpms).call
                 end
               end
             end
           else
             puts "#{os.name} is not a supported OS at this moment"
             exit(1)
           end
-
         end
 
         # rubocop:enable Metrics/ParameterLists:
diff --git a/lib/pgpm/contrib/postgres_fdw.rb b/lib/pgpm/contrib/postgres_fdw.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Pgpm
+  module Contrib
+    class PostgresFdw < Pgpm::Package
+      contrib_package
+    end
+  end
+end
diff --git a/lib/pgpm/package/dependencies.rb b/lib/pgpm/package/dependencies.rb
@@ -38,6 +38,10 @@ def requires
         []
       end
 
+      def all_requirements
+        requires.flat_map { |r| [r, *r.all_requirements] }.uniq
+      end
+
       def c_files_present?
         Dir.glob("*.c", base: source).any?
       end
diff --git a/lib/pgpm/package/git_hub.rb b/lib/pgpm/package/git_hub.rb
@@ -17,7 +17,7 @@ def sources
 
         def source_url_directory_name
           # GitHub strips leading `v` from version tags
-          commit = version_git_tag.gsub(/^v/, "") || version_git_commit
+          commit = version_git_tag&.gsub(/^v/, "") || version_git_commit
           "#{self.class.github_config.name.split("/").last}-#{commit}"
         end
       end
diff --git a/lib/pgpm/package/rust.rb b/lib/pgpm/package/rust.rb
@@ -22,7 +22,7 @@ def sources
 
           vendor_dir = Dir.mktmpdir("pgpm")
 
-          podman_cmd = "run -v #{Pgpm::Cache.directory}:#{Pgpm::Cache.directory} -v #{vendor_dir}:#{vendor_dir} -ti rust"
+          podman_cmd = "run -v #{Pgpm::Cache.directory}:#{Pgpm::Cache.directory} -v #{vendor_dir}:#{vendor_dir} -i rust"
           Podman.run("#{podman_cmd} cargo add --manifest-path #{source}/Cargo.toml --dev cargo-pgrx@#{pgrx_version}")
           Podman.run("#{podman_cmd} cargo vendor --versioned-dirs --manifest-path #{source}/Cargo.toml #{vendor_dir}/vendor")
           vendored_pgrx_version = Dir.glob("cargo-pgrx-*", base: File.join(vendor_dir, "vendor"))[0].split("-").last
diff --git a/lib/pgpm/podman.rb b/lib/pgpm/podman.rb
@@ -8,8 +8,8 @@ module Pgpm
   module Podman
     def self.run(command, unhandled_reboot_mitigation: true, print_stdout: true)
       result = TTY::Command.new(printer: :null).run("podman #{command}", pty: true) do |out, err|
-        $stderr.print(out.strip) if print_stdout
-        warn err
+        $stderr.print(out) if print_stdout
+        warn err if err
       end
 
       result.out
diff --git a/lib/pgpm/rpm/mock/operation.rb b/lib/pgpm/rpm/mock/operation.rb
@@ -60,32 +60,27 @@ def call
           options = @opts.flat_map { |(k, v)| ["--config-opts", "#{k}=#{v}"] }.compact.join(" ")
           command = "mock #{options} #{@args.join(" ")}"
           map_paths = @paths.map { |p| "-v #{p}:#{p}" }.join(" ")
-          raise "Failed to execute `#{command}`" unless Podman.run("run -v #{Dir.pwd}:#{Dir.pwd} #{map_paths} --privileged -ti ghcr.io/postgres-pm/pgpm #{command}")
+          raise "Failed to execute `#{command}`" unless Podman.run("run -v #{Dir.pwd}:#{Dir.pwd} #{map_paths} --privileged -i ghcr.io/postgres-pm/pgpm #{command}")
 
           @cb&.call
         end
 
         def chain(op)
           raise ArgumentError, "can't chain non-rebuild operations" unless op.args.include?("--rebuild") && @args.include?("--rebuild")
 
-          args = @args.clone
-          args.insert(@args.index("--localrepo") - 1, op.args[op.args.index("--localrepo") - 1])
-          self.class.new(*args, cb: lambda {
-            res1 = @cb&.call
-            res2 = op.cb&.call
-            return res1 + res2 if res1.is_a?(Array) && res2.is_a?(Array)
-
-            res2
-          })
+          args.insert(args.index("--localrepo"), *op.args[op.args.index("--recurse") + 1..op.args.index("--localrepo") - 1])
+          self
         end
 
         def and_then(op)
           lambda do
             res1 = call
             res2 = op.call
-            return res1 + res2 if res1.is_a?(Array) && res2.is_a?(Array)
-
-            [res1, res2]
+            if res1.is_a?(Array) && res2.is_a?(Array)
+              res1 + res2
+            else
+              [res1, res2]
+            end
           end
         end
       end
diff --git a/lib/pgpm/rpm/spec.rb b/lib/pgpm/rpm/spec.rb
@@ -27,8 +27,8 @@ def versionless
           License: #{@package.license}
 
           BuildRequires: #{@postgres_distribution.build_time_requirement_packages.join(" ")}
-          Requires: pgpm-#{@package.name}-#{@postgres_distribution.version}_#{@package.version}
-          BuildRequires: pgpm-#{@package.name}-#{@postgres_distribution.version}_#{@package.version}
+          Requires: pgpm-#{@package.name}+#{@package.version}-#{@postgres_distribution.version}
+          BuildRequires: pgpm-#{@package.name}+#{@package.version}-#{@postgres_distribution.version}
           BuildArch:  noarch
 
           %description
@@ -65,7 +65,7 @@ def to_s
         end
 
         <<~EOF
-          Name: pgpm-#{@package.name}-#{@postgres_distribution.version}_#{@package.version}
+          Name: pgpm-#{@package.name}+#{@package.version}-#{@postgres_distribution.version}
           Version: 1
           Release: 1%{?dist}
           Summary: #{@package.summary}
@@ -76,7 +76,7 @@ def to_s
           #{@package.build_dependencies.uniq.map { |dep| "BuildRequires: #{dep}" }.join("\n")}
           #{@package.dependencies.uniq.map { |dep| "Requires: #{dep}" }.join("\n")}
           #{@package.requires.uniq.map do |dep|
-            req = dep.contrib? ? @postgres_distribution.package_for(dep) : "pgpm-#{dep.name}-#{@postgres_distribution.version}_#{dep.version}"
+            req = dep.contrib? ? @postgres_distribution.package_for(dep) : "pgpm-#{dep.name}+#{dep.version}-#{@postgres_distribution.version}"
             raise "Can't build with a broken dependency #{dep.name}@#{dep.version}" if dep.broken?
 
             "Requires: #{req}#{"\nBuildRequires: #{req}" if dep.contrib?}"
diff --git a/packages/omnigres/extension_discovery.rb b/packages/omnigres/extension_discovery.rb
@@ -21,7 +21,9 @@ def initialize(revision: nil, path: nil)
       self.class.mutex.synchronize do
         git =
           if File.directory?(path)
-            ::Git.open(path)
+            g = ::Git.open(path)
+            g.pull
+            g
           else
             ::Git.clone("https://github.com/omnigres/omnigres", path)
           end
diff --git a/packages/omnigres/omni_cloudevents.rb b/packages/omnigres/omni_cloudevents.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Omnigres
+  class OmniCloudevents < Pgpm::Package
+    include Package
+
+    def summary
+      "CloudEvents support"
+    end
+  end
+end
diff --git a/packages/omnigres/omni_vfs_types_v1.rb b/packages/omnigres/omni_vfs_types_v1.rb
@@ -8,6 +8,14 @@ def summary
       "Virtual File System API"
     end
 
+    def requires
+      # FIXME: this handles the special case of this extension being in
+      # the same folder as omni_vfs.
+      # In order to configure it, all dependencies of omni_vfs, save for omni_vfs_types_v1,
+      # must be included.
+      Pgpm::Package["omnigres/omni_vfs"][:latest].requires.reject { |p| p.name == name }
+    end
+
     def native?
       # This extension shares the directory with `omni_vfs` which has .c files,
       # but it is not a native-code extension itself.
diff --git a/packages/omnigres/package.rb b/packages/omnigres/package.rb
@@ -67,9 +67,11 @@ def version_git_commit
 
     def configure_steps
       extra_config = contains_vendorized_deps? ? "" : "-DCPM_SOURCE_CACHE=$(pwd)/deps/_deps "
-      ["export PIP_CONFIG_FILE=$(pwd)/deps/pip.conf",
-       "cmake -S #{extension_path} -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo " \
-         "-DOPENSSL_CONFIGURED=1 -DPG_CONFIG=$PG_CONFIG #{extra_config} -DCMAKE_POSITION_INDEPENDENT_CODE=ON"]
+      steps = ["export PIP_CONFIG_FILE=$(pwd)/deps/pip.conf",
+               "cmake -S #{extension_path} -B build -DCMAKE_BUILD_TYPE=RelWithDebInfo " \
+                 "-DOPENSSL_CONFIGURED=1 -DPG_CONFIG=$PG_CONFIG #{extra_config} -DCMAKE_POSITION_INDEPENDENT_CODE=ON"]
+      steps.unshift("source /opt/rh/gcc-toolset-14/enable") if Pgpm::OS.in_scope.is_a?(Pgpm::OS::RedHat)
+      steps
     end
 
     def build_steps
@@ -106,7 +108,9 @@ def license
     end
 
     def build_dependencies
-      %w[cmake openssl-devel python3 python3-devel nc sudo git] + super
+      deps = %w[cmake openssl-devel python3 python3-devel nc sudo git] + super
+      deps.push("gcc-toolset-14") if Pgpm::OS.in_scope.is_a?(Pgpm::OS::RedHat)
+      deps
     end
 
     def dependencies
@@ -182,7 +186,7 @@ def artifacts(src = nil)
         rescue Git::GitExecuteError
           share_fix = "-e PGSHAREDIR=#{pgpath}/build/share"
         end
-        unless Pgpm::Podman.run "run -ti #{share_fix} -v #{source}:#{source} -v #{Pgpm::Cache.directory}:#{Pgpm::Cache.directory} #{PGPM_BUILD_CONTAINER_IMAGE}  cmake -S #{src} -B #{src}/build -DOPENSSL_CONFIGURED=1 -DPGVER=#{Pgpm::Postgres::Distribution.in_scope.version} -DPGDIR=#{pgpath}"
+        unless Pgpm::Podman.run "run -i #{share_fix} -v #{src}:#{src} -v #{Pgpm::Cache.directory}:#{Pgpm::Cache.directory} #{PGPM_BUILD_CONTAINER_IMAGE}  cmake -S #{src} -B #{src}/build -DOPENSSL_CONFIGURED=1 -DPGVER=#{Pgpm::Postgres::Distribution.in_scope.version} -DPGDIR=#{pgpath}"
           raise "Can't configure the project"
         end
 
@@ -208,25 +212,28 @@ def requires
       end
     end
 
-    def original_sources
-      method(:sources).super_method.call
+    def dont_fetch_previous
+      @dont_fetch_previous = true
+      self
     end
 
     def sources
       return @srcs if @srcs
 
-      @srcs = original_sources
+      @srcs = super
+      return @srcs if @dont_fetch_previous
+
       unless contains_vendorized_deps?
         @srcs.push(deps_tar_gz)
       end
       if previous_version && !previous_version.broken?
         begin
-          puts "Fetching previous version #{previous_version.version} to be able to generate migrations"
-          @srcs.push(*previous_version.original_sources) # archive
+          puts "Fetching previous version of #{name} (#{previous_version.version}) to be able to generate migrations"
+          @srcs.push(*previous_version.dont_fetch_previous.sources) # archive
           @srcs.push(previous_version.deps_tar_gz("deps-prev")) unless previous_version.contains_vendorized_deps?
         rescue UnsupportedVersion
           # ignore this one, just don't build an upgrade
-          puts "Ignore #{previous_version.version}, it is unsupported"
+          puts "Ignore #{name} #{previous_version.version}, it is unsupported"
           @srcs.pop # get the version out
           @no_migration = true
         end
@@ -291,15 +298,13 @@ def install_prerequisites
       return if @prerequisites_installed
 
       @os = Pgpm::OS.auto_detect
-      if @os.is_a?(Pgpm::OS::RedHat)
-        images = Oj.load(Pgpm::Podman.run("images --format json", print_stdout: false))
-        unless images.flat_map { |i| i["Names"] }.include?("localhost/#{PGPM_BUILD_CONTAINER_IMAGE}:latest")
-          tmpfile = Tempfile.new
-          Pgpm::Podman.run "run -ti --cidfile #{tmpfile.path} #{PGPM_BUILD_CONTAINER}"
-          id = File.read(tmpfile.path)
-          tmpfile.unlink
-          Pgpm::Podman.run "commit #{id} #{PGPM_BUILD_CONTAINER_IMAGE}"
-        end
+      images = Oj.load(Pgpm::Podman.run("images --format json", print_stdout: false))
+      unless images.flat_map { |i| i["Names"] }.include?("localhost/#{PGPM_BUILD_CONTAINER_IMAGE}:latest")
+        tmpfile = Tempfile.new
+        Pgpm::Podman.run "run -i --cidfile #{tmpfile.path} #{PGPM_BUILD_CONTAINER}"
+        id = File.read(tmpfile.path)
+        tmpfile.unlink
+        Pgpm::Podman.run "commit #{id} #{PGPM_BUILD_CONTAINER_IMAGE}"
       end
       @prerequisites_installed = true
     end
@@ -314,7 +319,7 @@ def cmake_dependencies(dir_name = "deps")
       return if File.exist?(ready_marker)
       raise UnsupportedVersion unless File.directory?(File.join(src, "cmake", "dependencies"))
 
-      unless Pgpm::Podman.run "run -ti -v #{Pgpm::Cache.directory}:#{Pgpm::Cache.directory} #{PGPM_BUILD_CONTAINER_IMAGE} cmake -S #{src}/cmake/dependencies -B #{deps} -DCPM_SOURCE_CACHE=#{deps}/_deps"
+      unless Pgpm::Podman.run "run -i -v #{Pgpm::Cache.directory}:#{Pgpm::Cache.directory} #{PGPM_BUILD_CONTAINER_IMAGE} cmake -S #{src}/cmake/dependencies -B #{deps} -DCPM_SOURCE_CACHE=#{deps}/_deps"
         raise "Can't fetch dependencies"
       end
 
