more os versions

Author: aykut-bozkurt

.devcontainer/Dockerfile

@@ -13,55 +13,33 @@ SHELL ["/bin/bash", "-c"]
 
 # install deps
 RUN if [ "${BASE_IMAGE_OS}" = "debian" ]; then \
-      apt-get update && apt-get -y install build-essential libreadline-dev zlib1g-dev \
-                                    flex bison libxml2-dev libxslt-dev libssl-dev     \
-                                    libxml2-utils xsltproc ccache pkg-config wget     \
-                                    curl lsb-release ca-certificates gnupg sudo git   \
-                                    nano net-tools awscli libkrb5-dev python3.11 pip; \
+      apt-get update && \
+      apt-get -y install build-essential libreadline-dev zlib1g-dev flex bison         \
+                         libxml2-dev libxslt-dev libssl-dev git libxml2-utils xsltproc \
+                         pkg-config wget curl sudo lsb-release ca-certificates gnupg   \
+                         nano net-tools libkrb5-dev python3 python3-pip python3-venv   \
+                         python3-dev &&                                                \
+      apt install --only-upgrade python3-pip && \
+      pip3 install pipx --break-system-packages; \
     fi
 RUN if [ "${BASE_IMAGE_OS}" = "almalinux" ]; then \
       dnf -y update && \
       dnf -y install epel-release && \
-      dnf config-manager --enable crb && \
-      dnf -y install gcc gcc-c++ make readline-devel zlib-devel which     \
-                     flex bison libxml2-devel libxslt-devel openssl-devel \
-                     ccache pkgconfig wget lsb_release ca-certificates    \
-                     gnupg sudo git nano net-tools awscli krb5-devel      \
-                     python3.11 pip;                                      \
-    fi
-
-# Upgrade pip and uv
-RUN if [ "$BASE_IMAGE_OS" = "almalinux" ]; then \
-        python3.11 -m ensurepip --upgrade && \
-        python3.11 -m pip install --upgrade pip && \
-        python3.11 -m pip install uv; \
-    fi
-RUN if [ "$BASE_IMAGE_OS" = "debian" ]; then \
-        python3.11 -m pip install --upgrade pip --break-system-packages && \
-        python3.11 -m pip install uv --break-system-packages; \
-    fi
-
-ENV PATH="~/.local/bin:$PATH"
-
-# Install uv (we run mitmproxy with it)
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh
-
-# install azure-cli
-RUN if [ "${BASE_IMAGE_OS}" = "debian" ]; then \
-      curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor | tee /etc/apt/keyrings/microsoft.gpg > /dev/null && \
-      echo "deb [arch=`dpkg --print-architecture` signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ `lsb_release -cs` main" | tee /etc/apt/sources.list.d/azure-cli.list && \
-      apt-get update && apt-get install -y azure-cli; \
-    fi
-RUN if [ "${BASE_IMAGE_OS}" = "almalinux" ]; then \
-      rpm --import https://packages.microsoft.com/keys/microsoft.asc && \
-      dnf install -y https://packages.microsoft.com/config/rhel/${BASE_IMAGE_OS_VERSION}/packages-microsoft-prod.rpm && \
-      dnf install -y azure-cli; \
+      (dnf config-manager --set-enabled powertools || true) && \
+      (dnf config-manager --set-enabled crb || true) && \
+      dnf -y install gcc gcc-c++ make readline-devel zlib-devel flex bison libxml2-devel    \
+                     libxslt-devel openssl-devel pkgconfig wget ca-certificates sudo git    \
+                     which gnupg nano net-tools krb5-devel python3 python3-pip              \
+                     platform-python-devel &&                                               \
+      pip3 install --upgrade pip && \
+      pip3 install pipx; \
     fi
 
 # install Postgres
 RUN if [ "${BASE_IMAGE_OS}" = "debian" ]; then \
-      sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
-      wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \
+      wget -O- https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor > postgresql-keyring.gpg && \
+      cat postgresql-keyring.gpg | sudo tee -a /usr/share/keyrings/postgresql-keyring.gpg > /dev/null && \
+      sh -c 'echo "deb [signed-by=/usr/share/keyrings/postgresql-keyring.gpg] https://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \
       apt-get update && apt-get -y install postgresql-{14,15,16,17,18}-postgis-3  \
                                            postgresql-{14,15,16,17,18}-pgaudit    \
                                            postgresql-server-dev-{14,15,16,17,18} \
@@ -71,7 +49,7 @@ RUN if [ "${BASE_IMAGE_OS}" = "debian" ]; then \
 RUN if [ "${BASE_IMAGE_OS}" = "almalinux" ]; then \
       ARCH=$(uname -m) && \
       dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-$(rpm -E %{rhel})-${ARCH}/pgdg-redhat-repo-latest.noarch.rpm && \
-      dnf -qy module disable postgresql && \
+      (dnf -qy module disable postgresql || true) && \
       dnf install -y --nogpgcheck \
                      postgis36_{14,15,16,17,18}        \
                      pgaudit{16_14,17_15,_16,_17,_18}  \
@@ -142,6 +120,10 @@ RUN echo "$USERNAME ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USERNAME
 
 USER $USERNAME
 
+# Install awscli, azure-cli and mitmdump with rust user
+RUN pipx install mitmproxy && pipx install awscli && pipx install azure-cli
+ENV PATH="~/.local/bin:${PATH}"
+
 # install Rust environment
 ARG RUSTC_VERSION=1.90.0
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y

.github/workflows/ci.yml

@@ -24,10 +24,18 @@ jobs:
             arch: x86_64
           - runs_on: ubuntu-22.04-arm
             arch: aarch64
+          - base_image_os: almalinux
+            base_image_os_version: 8
           - base_image_os: almalinux
             base_image_os_version: 9
+          - base_image_os: almalinux
+            base_image_os_version: 10
           - base_image_os: debian
             base_image_os_version: bookworm
+          - base_image_os: debian
+            base_image_os_version: trixie
+          - base_image_os: debian
+            base_image_os_version: forky
 
     runs-on: ${{ matrix.runs_on }}
 
@@ -60,10 +68,18 @@ jobs:
             arch: x86_64
           - runs_on: ubuntu-22.04-arm
             arch: aarch64
+          - base_image_os: almalinux
+            base_image_os_version: 8
           - base_image_os: almalinux
             base_image_os_version: 9
+          - base_image_os: almalinux
+            base_image_os_version: 10
           - base_image_os: debian
             base_image_os_version: bookworm
+          - base_image_os: debian
+            base_image_os_version: trixie
+          - base_image_os: debian
+            base_image_os_version: forky
 
     runs-on: ${{ matrix.runs_on }}
 

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build clean install uninstall package set-pg_config-path \
 	check check-with-coverage check-minio check-azure check-gcs check-http check-format check-lint \
-	start-containers stop-containers
+	start-containers stop-containers build-containers
 
 ENVFILE ?= .devcontainer/.env
 
@@ -98,7 +98,7 @@ ifeq ($(FAKE_GCS_IMAGE),docker.io/tustvold/fake-gcs-server)
 endif
 endif
 
-	# start containers in detached mode
+	# start containers in detached mode without building pg_parquet image (might pull missing images)
 	docker compose -f .devcontainer/docker-compose.yml up -d --no-build
 
 	is_healthy() { \
@@ -121,3 +121,6 @@ endif
 
 stop-containers:
 	docker compose -f .devcontainer/docker-compose.yml stop
+
+build-containers:
+	docker compose -f .devcontainer/docker-compose.yml build

build.rs

@@ -1,20 +1,6 @@
-use std::process::Command;
-
 use cfg_aliases::cfg_aliases;
 
 fn main() {
-    println!("cargo::rustc-check-cfg=cfg(rhel8)");
-    let output = Command::new("cat")
-        .arg("/etc/os-release")
-        .output()
-        .expect("Failed to execute command");
-
-    let os_info = String::from_utf8(output.stdout).unwrap();
-
-    if os_info.contains("platform:el8") {
-        println!("cargo::rustc-cfg=rhel8");
-    }
-
     cfg_aliases! {
         pre_pg18: { any(feature = "pg14", feature = "pg15", feature = "pg16", feature = "pg17") },
         pre_pg17: { any(feature = "pg14", feature = "pg15", feature = "pg16") },

src/pgrx_tests/common.rs

@@ -366,15 +366,6 @@ pub(crate) fn extension_exists(extension_name: &str) -> bool {
     Spi::get_one(&query).unwrap().unwrap()
 }
 
-pub(crate) fn extension_version(extension_name: &str) -> String {
-    let quoted_extension = spi::quote_literal(extension_name);
-    let query = format!(
-        "select default_version from pg_available_extensions where name = {quoted_extension}"
-    );
-
-    Spi::get_one(&query).unwrap().unwrap()
-}
-
 pub(crate) fn write_record_batch_to_parquet(schema: SchemaRef, record_batch: RecordBatch) {
     let file = File::create(LOCAL_TEST_FILE_PATH).unwrap();
     let mut writer = ArrowWriter::try_new(file, schema, None).unwrap();

src/pgrx_tests/copy_type_roundtrip.rs

@@ -4,8 +4,8 @@ mod tests {
 
     use crate::pgrx_tests::common::{
         assert_double, assert_float, assert_int_text_map, assert_json, assert_jsonb,
-        extension_exists, extension_version, timetz_array_to_utc_time_array, timetz_to_utc_time,
-        TestResult, TestTable, LOCAL_TEST_FILE_PATH,
+        extension_exists, timetz_array_to_utc_time_array, timetz_to_utc_time, TestResult,
+        TestTable, LOCAL_TEST_FILE_PATH,
     };
     use crate::type_compat::fallback_to_text::FallbackToText;
     use crate::type_compat::geometry::{
@@ -1038,7 +1038,7 @@ mod tests {
     #[pg_test]
     fn test_geometry() {
         // Skip the test if postgis extension is not available
-        if !extension_exists("postgis") || *extension_version("postgis") < *"3.4" {
+        if !extension_exists("postgis") {
             return;
         }
 
@@ -1056,7 +1056,7 @@ mod tests {
     #[pg_test]
     fn test_geometry_array() {
         // Skip the test if postgis extension is not available
-        if !extension_exists("postgis") || *extension_version("postgis") < *"3.4" {
+        if !extension_exists("postgis") {
             return;
         }
 
@@ -1071,7 +1071,7 @@ mod tests {
     #[pg_test]
     fn test_geometry_geoparquet_metadata() {
         // Skip the test if postgis extension is not available
-        if !extension_exists("postgis") || *extension_version("postgis") < *"3.4" {
+        if !extension_exists("postgis") {
             return;
         }
 

src/pgrx_tests/object_store.rs

@@ -331,7 +331,6 @@ mod tests {
     }
 
     #[pg_test]
-    #[cfg(not(rhel8))]
     fn test_s3_temporary_token() {
         object_store_cache_clear();
 
@@ -458,7 +457,6 @@ mod tests {
     }
 
     #[pg_test]
-    #[cfg(not(rhel8))]
     fn test_azure_blob_from_env() {
         object_store_cache_clear();
 
@@ -486,7 +484,6 @@ mod tests {
     }
 
     #[pg_test]
-    #[cfg(not(rhel8))]
     fn test_azure_blob_from_env_glob_pattern() {
         object_store_cache_clear();
 
@@ -519,7 +516,6 @@ mod tests {
     }
 
     #[pg_test]
-    #[cfg(not(rhel8))]
     fn test_azure_uri_with_special_chars() {
         object_store_cache_clear();
 
@@ -546,7 +542,6 @@ mod tests {
     }
 
     #[pg_test]
-    #[cfg(not(rhel8))]
     #[should_panic(expected = "no files found that match the pattern")]
     fn test_azure_with_nonexistent_pattern_uri() {
         object_store_cache_clear();
@@ -565,7 +560,6 @@ mod tests {
     }
 
     #[pg_test]
-    #[cfg(not(rhel8))]
     fn test_azure_from_config_file() {
         object_store_cache_clear();
 
@@ -612,7 +606,6 @@ mod tests {
     }
 
     #[pg_test]
-    #[cfg(not(rhel8))]
     fn test_azure_from_env_via_connection_string() {
         object_store_cache_clear();
 
@@ -641,7 +634,6 @@ mod tests {
     }
 
     #[pg_test]
-    #[cfg(not(rhel8))]
     fn test_azure_from_config_via_connection_string() {
         object_store_cache_clear();
 
@@ -685,7 +677,6 @@ mod tests {
 
     #[pg_test]
     #[should_panic(expected = "Account must be specified")]
-    #[cfg(not(rhel8))]
     fn test_azure_no_storage_account() {
         object_store_cache_clear();
 
@@ -707,7 +698,6 @@ mod tests {
 
     #[pg_test]
     #[should_panic(expected = "403 Forbidden")]
-    #[cfg(not(rhel8))]
     fn test_azure_wrong_storage_key() {
         object_store_cache_clear();
 
@@ -734,7 +724,6 @@ mod tests {
 
     #[pg_test]
     #[should_panic(expected = "404 Not Found")]
-    #[cfg(not(rhel8))]
     fn test_azure_write_wrong_container() {
         object_store_cache_clear();
 
@@ -751,7 +740,6 @@ mod tests {
     }
 
     #[pg_test]
-    #[cfg(not(rhel8))]
     fn test_azure_read_write_sas() {
         object_store_cache_clear();
 
@@ -780,7 +768,6 @@ mod tests {
 
     #[pg_test]
     #[should_panic(expected = "403 Forbidden")]
-    #[cfg(not(rhel8))]
     fn test_azure_read_only_sas() {
         object_store_cache_clear();
 
@@ -809,7 +796,6 @@ mod tests {
 
     #[pg_test]
     #[should_panic(expected = "could not open file")]
-    #[cfg(not(rhel8))]
     fn test_azure_unsupported_uri() {
         object_store_cache_clear();
 
@@ -1029,7 +1015,6 @@ mod tests {
     }
 
     #[pg_test]
-    #[cfg(not(rhel8))]
     fn test_object_store_cache() {
         object_store_cache_clear();