Skip to content

Commit df1c4ad

Browse files
gaoxueyugaoxueyu
authored
Merge pull request #2 from balinorLiang/feature/CICD_feature
ivorysql compatible with documentdb
2 parents 4b0faab + 176fc92 commit df1c4ad

21 files changed

Lines changed: 338 additions & 247 deletions

‎.devcontainer/Dockerfile‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:22.04
22
ARG POSTGRES_INSTALL_ARG=
3-
ARG PG_VERSION=16
3+
ARG IVORY_VERSION=4
44
ARG CITUS_VERSION=12
55

66
# declare installed PG version and Citus version
7-
ENV PG_VERSION=${PG_VERSION}
7+
ENV IVORY_VERSION=${IVORY_VERSION}
88
ENV CITUS_VERSION=${CITUS_VERSION}
99

1010
# Install build essentials - Compiler, debugger, make, etc.
@@ -35,6 +35,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
3535
libtool \
3636
libicu-dev \
3737
libssl-dev \
38+
libxml2-dev \
3839
&& rm -rf /var/lib/apt/lists/*
3940

4041
# Add pgdg repo
@@ -60,27 +61,27 @@ COPY scripts/utils.sh /tmp/install_setup/
6061

6162
# Install postgres
6263
COPY scripts/install_setup_postgres.sh /tmp/install_setup/
63-
RUN [ "bin/bash", "-c", "/tmp/install_setup/install_setup_postgres.sh -d \"/usr/lib/postgresql/${PG_VERSION}\" $POSTGRES_INSTALL_ARG -v ${PG_VERSION}" ]
64+
RUN [ "bin/bash", "-c", "/tmp/install_setup/install_setup_postgres.sh -d \"/var/local/ivorysql/ivory-${IVORY_VERSION}\" $POSTGRES_INSTALL_ARG -v ${IVORY_VERSION}" ]
6465

6566
# Install RUM from source
6667
COPY scripts/install_setup_rum_oss.sh /tmp/install_setup/
67-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_rum_oss.sh" ]
68+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_rum_oss.sh" ]
6869

6970
# Install citus
7071
COPY scripts/install_setup_citus_core_oss.sh /tmp/install_setup/
71-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_citus_core_oss.sh ${CITUS_VERSION}" ]
72+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_citus_core_oss.sh ${CITUS_VERSION}" ]
7273

7374
# Install citus-indent
7475
COPY scripts/install_citus_indent.sh /tmp/install_setup/
7576
RUN [ "bin/bash", "-c", "/tmp/install_setup/install_citus_indent.sh" ]
7677

7778
# Install SYSTEM_ROWS
7879
COPY scripts/install_setup_system_rows.sh /tmp/install_setup/
79-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_system_rows.sh" ]
80+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_system_rows.sh" ]
8081

8182
# Install PG_CRON
8283
COPY scripts/install_setup_pg_cron.sh /tmp/install_setup/
83-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_pg_cron.sh" ]
84+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_pg_cron.sh" ]
8485

8586
# Download Decimal128 Intel library
8687
COPY scripts/install_setup_intel_decimal_math_lib.sh /tmp/install_setup/
@@ -92,7 +93,7 @@ RUN [ "bin/bash", "-c", "/tmp/install_setup/install_setup_pcre2.sh" ]
9293

9394
# Install PG_VECTOR
9495
COPY scripts/install_setup_pgvector.sh /tmp/install_setup/
95-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_pgvector.sh" ]
96+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_pgvector.sh" ]
9697

9798
# Install PostGIS from source
9899
RUN apt-get update && \
@@ -105,7 +106,7 @@ RUN apt-get update && \
105106
&& rm -rf /var/lib/apt/lists/*
106107

107108
COPY scripts/install_setup_postgis.sh /tmp/install_setup/
108-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_postgis.sh" ]
109+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_postgis.sh" ]
109110

110111
# locale
111112
RUN rm -rf /var/lib/apt/lists/* \
@@ -121,10 +122,10 @@ RUN echo "%sudo ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers.d/no-pass-ask
121122

122123
# Add postgres to path for sudo commands.
123124
# Add path for sudoers
124-
RUN cat /etc/sudoers | grep secure_path | sed "s/\:\/bin\:/\:\/bin\:\/usr\/lib\/postgresql\/$PG_VERSION\/bin\:/" >> /etc/sudoers.d/postgres_path
125+
RUN cat /etc/sudoers | grep secure_path | sed "s/\:\/bin\:/\:\/bin\:\/var\/local\/ivorysql\/ivory-$IVORY_VERSION\/bin\:/" >> /etc/sudoers.d/postgres_path
125126

126127
# Add PG to the path
127-
ENV PATH=$PATH:/usr/lib/postgresql/$PG_VERSION/bin
128+
ENV PATH=$PATH:/var/local/ivorysql/ivory-$IVORY_VERSION/bin
128129

129130
USER documentdb
130131
WORKDIR /home/documentdb

‎.github/containers/Build-Ubuntu/Dockerfile‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
FROM mcr.microsoft.com/mirror/docker/library/ubuntu:22.04
22
ARG POSTGRES_INSTALL_ARG=
3-
ARG PG_VERSION=16
3+
ARG IVORY_VERSION=4
44
ARG CITUS_VERSION=12
55

66
# declare installed PG version and Citus version
7-
ENV PG_VERSION=${PG_VERSION}
7+
ENV IVORY_VERSION=${IVORY_VERSION}
88
ENV CITUS_VERSION=${CITUS_VERSION}
99

1010
# Install build essentials - Compiler, debugger, make, etc.
@@ -20,8 +20,8 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
2020
pkg-config \
2121
cmake \
2222
git \
23-
locales \
24-
gcc \
23+
locales \
24+
gcc \
2525
gdb \
2626
libipc-run-perl \
2727
unzip \
@@ -35,6 +35,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
3535
libtool \
3636
libicu-dev \
3737
libssl-dev \
38+
libxml2-dev \
3839
&& rm -rf /var/lib/apt/lists/*
3940

4041
# Add pgdg repo
@@ -60,27 +61,27 @@ COPY scripts/utils.sh /tmp/install_setup/
6061

6162
# Install postgres
6263
COPY scripts/install_setup_postgres.sh /tmp/install_setup/
63-
RUN [ "bin/bash", "-c", "/tmp/install_setup/install_setup_postgres.sh -d \"/usr/lib/postgresql/${PG_VERSION}\" $POSTGRES_INSTALL_ARG -v ${PG_VERSION}" ]
64+
RUN [ "bin/bash", "-c", "/tmp/install_setup/install_setup_postgres.sh -d \"/var/local/ivorysql/ivory-${IVORY_VERSION}\" $POSTGRES_INSTALL_ARG -v ${IVORY_VERSION}" ]
6465

6566
# Install RUM from source
6667
COPY scripts/install_setup_rum_oss.sh /tmp/install_setup/
67-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_rum_oss.sh" ]
68+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_rum_oss.sh" ]
6869

6970
# Install citus
7071
COPY scripts/install_setup_citus_core_oss.sh /tmp/install_setup/
71-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_citus_core_oss.sh ${CITUS_VERSION}" ]
72+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_citus_core_oss.sh ${CITUS_VERSION}" ]
7273

7374
# Install citus-indent
7475
COPY scripts/install_citus_indent.sh /tmp/install_setup/
7576
RUN [ "bin/bash", "-c", "/tmp/install_setup/install_citus_indent.sh" ]
7677

7778
# Install SYSTEM_ROWS
7879
COPY scripts/install_setup_system_rows.sh /tmp/install_setup/
79-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_system_rows.sh" ]
80+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_system_rows.sh" ]
8081

8182
# Install PG_CRON
8283
COPY scripts/install_setup_pg_cron.sh /tmp/install_setup/
83-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_pg_cron.sh" ]
84+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_pg_cron.sh" ]
8485

8586
# Download Decimal128 Intel library
8687
COPY scripts/install_setup_intel_decimal_math_lib.sh /tmp/install_setup/
@@ -92,19 +93,20 @@ RUN [ "bin/bash", "-c", "/tmp/install_setup/install_setup_pcre2.sh" ]
9293

9394
# Install PG_VECTOR
9495
COPY scripts/install_setup_pgvector.sh /tmp/install_setup/
95-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_pgvector.sh" ]
96+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_pgvector.sh" ]
9697

9798
# Install PostGIS from source
98-
RUN add-apt-repository -y ppa:ubuntugis/ppa && apt-get update && \
99+
RUN apt-get update && \
99100
apt-get install -qy \
100101
libproj-dev \
101102
libxml2-dev \
102103
libjson-c-dev \
103-
libgeos-dev \
104104
libgeos++-dev \
105+
libgeos-dev \
105106
&& rm -rf /var/lib/apt/lists/*
107+
106108
COPY scripts/install_setup_postgis.sh /tmp/install_setup/
107-
RUN [ "bin/bash", "-c", "PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_postgis.sh" ]
109+
RUN [ "bin/bash", "-c", "IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_postgis.sh" ]
108110

109111
# locale
110112
RUN rm -rf /var/lib/apt/lists/* \
@@ -120,14 +122,10 @@ RUN echo "%sudo ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers.d/no-pass-ask
120122

121123
# Add postgres to path for sudo commands.
122124
# Add path for sudoers
123-
RUN cat /etc/sudoers | grep secure_path | sed "s/\:\/bin\:/\:\/bin\:\/usr\/lib\/postgresql\/$PG_VERSION\/bin\:/" >> /etc/sudoers.d/postgres_path
125+
RUN cat /etc/sudoers | grep secure_path | sed "s/\:\/bin\:/\:\/bin\:\/var\/local\/ivorysql\/ivory-$IVORY_VERSION\/bin\:/" >> /etc/sudoers.d/postgres_path
124126

125127
# Add PG to the path
126-
ENV PATH=$PATH:/usr/lib/postgresql/$PG_VERSION/bin
128+
ENV PATH=$PATH:/var/local/ivorysql/ivory-$IVORY_VERSION/bin
127129

128130
USER documentdb
129131
WORKDIR /home/documentdb
130-
131-
LABEL org.opencontainers.image.source=https://github.com/microsoft/documentdb
132-
LABEL org.opencontainers.image.description="DocumentDB ubuntu build image"
133-
LABEL org.opencontainers.image.licenses=MIT

‎.github/workflows/build_packages.yml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ jobs:
3838
runner: ubuntu-24.04
3939
- arch: arm64
4040
runner: ubuntu-24.04-arm
41-
pg_version:
42-
- 16
43-
- 17
41+
ivory_version:
42+
- 4
4443

4544
steps:
4645
- name: Checkout repository
@@ -56,12 +55,12 @@ jobs:
5655
5756
- name: Build Debian Package
5857
run: |
59-
./packaging/build_packages.sh --os ${{ matrix.os }} --pg ${{ matrix.pg_version }} --version ${{ env.DOCUMENTDB_VERSION }}
58+
./packaging/build_packages.sh --os ${{ matrix.os }} --ivy ${{ matrix.ivory_version }} --version ${{ env.DOCUMENTDB_VERSION }}
6059
6160
- name: Upload Debian Package as Artifact
6261
uses: actions/upload-artifact@v4
6362
with:
64-
name: archive-${{ matrix.os }}-${{ matrix.arch }}-pg${{ matrix.pg_version }}-documentdb-${{ env.DOCUMENTDB_VERSION }}
63+
name: archive-${{ matrix.os }}-${{ matrix.arch }}-pg${{ matrix.ivory_version }}-documentdb-${{ env.DOCUMENTDB_VERSION }}
6564
path: |
6665
packaging/*.deb
6766
retention-days: 7
@@ -121,10 +120,10 @@ jobs:
121120
push: true
122121
platforms: linux/${{ matrix.arch }}
123122
file: .github/containers/Build-Ubuntu/Dockerfile_prebuild
124-
tags: ghcr.io/${{ github.repository }}/documentdb-oss:PG${{ matrix.pg_version }}-${{ matrix.arch }}-${{ env.DOCUMENTDB_VERSION }}
123+
tags: ghcr.io/${{ github.repository }}/documentdb-oss:PG${{ matrix.ivory_version }}-${{ matrix.arch }}-${{ env.DOCUMENTDB_VERSION }}
125124
build-args: |
126125
BASE_IMAGE=${{ env.BASE_IMAGE }}
127-
POSTGRES_VERSION=${{ matrix.pg_version }}
126+
IVORY_VERSION=${{ matrix.ivory_version }}
128127
DEB_PACKAGE_REL_PATH=${{ env.PACKAGE_NAME }}
129128
labels: |
130129
org.opencontainers.image.source=https://github.com/microsoft/documentdb
@@ -138,7 +137,7 @@ jobs:
138137
- name: Sign manifest (keyless)
139138
if: startsWith(github.ref, 'refs/tags/')
140139
run: |
141-
cosign sign ghcr.io/${{ github.repository }}/documentdb-oss:PG${{ matrix.pg_version }}-${{ matrix.arch }}-${{ env.DOCUMENTDB_VERSION }} -y
140+
cosign sign ghcr.io/${{ github.repository }}/documentdb-oss:PG${{ matrix.ivory_version }}-${{ matrix.arch }}-${{ env.DOCUMENTDB_VERSION }} -y
142141
143142
- name: Verify manifest signature (keyless)
144143
if: startsWith(github.ref, 'refs/tags/')
@@ -147,4 +146,4 @@ jobs:
147146
cosign verify \
148147
--certificate-identity-regexp "https://github.com/${{ github.repository }}/.github/workflows/build_packages.yml@refs/(heads|tags)/${{ github.ref_name }}" \
149148
--certificate-oidc-issuer "https://token.actions.githubusercontent.com" \
150-
ghcr.io/${{ github.repository }}/documentdb-oss:PG${{ matrix.pg_version }}-${{ matrix.arch }}-${{ env.DOCUMENTDB_VERSION }}
149+
ghcr.io/${{ github.repository }}/documentdb-oss:PG${{ matrix.ivory_version }}-${{ matrix.arch }}-${{ env.DOCUMENTDB_VERSION }}

‎.github/workflows/build_rpm_packages.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ jobs:
3232
include:
3333
- arch: amd64
3434
runner: ubuntu-24.04
35-
pg_version:
36-
- 16
37-
- 17
35+
ivory_version:
36+
- 4
3837

3938
steps:
4039
- name: Checkout repository
@@ -50,12 +49,12 @@ jobs:
5049
5150
- name: Build RPM Package
5251
run: |
53-
./packaging/build_packages.sh --os ${{ matrix.os }} --pg ${{ matrix.pg_version }} --version ${{ env.DOCUMENTDB_VERSION }} --test-clean-install
52+
./packaging/build_packages.sh --os ${{ matrix.os }} --ivy ${{ matrix.ivory_version }} --version ${{ env.DOCUMENTDB_VERSION }} --test-clean-install
5453
5554
- name: Upload RPM Package as Artifact
5655
uses: actions/upload-artifact@v4
5756
with:
58-
name: ${{ matrix.os }}-${{ matrix.arch }}-pg${{ matrix.pg_version }}-documentdb-${{ env.DOCUMENTDB_VERSION }}
57+
name: ${{ matrix.os }}-${{ matrix.arch }}-pg${{ matrix.ivory_version }}-documentdb-${{ env.DOCUMENTDB_VERSION }}
5958
path: |
6059
packaging/*.rpm
6160
retention-days: 7

‎.github/workflows/regress_tests.yml‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,8 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
pg_version:
31-
- 15
32-
- 16
33-
- 17
30+
ivory_version:
31+
- 4
3432
arch:
3533
- amd64
3634
- arm64
@@ -51,7 +49,7 @@ jobs:
5149
5250
- name: Install package dependencies
5351
run: |
54-
export PG_VERSION=${{ matrix.pg_version }}
52+
export IVORY_VERSION=${{ matrix.ivory_version }}
5553
export CITUS_VERSION=12
5654
5755
export LC_ALL=en_US.UTF-8
@@ -100,23 +98,23 @@ jobs:
10098
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT MAKE_PROGRAM=cmake /tmp/install_setup/install_setup_libbson.sh
10199
cp ./scripts/utils.sh /tmp/install_setup
102100
cp ./scripts/install_setup_postgres.sh /tmp/install_setup/
103-
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_setup_postgres.sh -d /usr/lib/postgresql/${PG_VERSION} $POSTGRES_INSTALL_ARG -v ${PG_VERSION}
101+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_setup_postgres.sh -d /var/local/ivorysql/ivory-${IVORY_VERSION} $POSTGRES_INSTALL_ARG -v ${IVORY_VERSION}
104102
cp ./scripts/install_setup_rum_oss.sh /tmp/install_setup/
105-
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_rum_oss.sh
103+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_rum_oss.sh
106104
cp ./scripts/install_setup_citus_core_oss.sh /tmp/install_setup/
107-
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_citus_core_oss.sh ${CITUS_VERSION}
105+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_citus_core_oss.sh ${CITUS_VERSION}
108106
cp ./scripts/install_citus_indent.sh /tmp/install_setup/
109107
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_citus_indent.sh
110108
cp ./scripts/install_setup_system_rows.sh /tmp/install_setup/
111-
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_system_rows.sh
109+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_system_rows.sh
112110
cp ./scripts/install_setup_pg_cron.sh /tmp/install_setup/
113-
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_pg_cron.sh
111+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_pg_cron.sh
114112
cp ./scripts/install_setup_intel_decimal_math_lib.sh /tmp/install_setup/
115113
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_setup_intel_decimal_math_lib.sh
116114
cp ./scripts/install_setup_pcre2.sh /tmp/install_setup/
117115
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT /tmp/install_setup/install_setup_pcre2.sh
118116
cp ./scripts/install_setup_pgvector.sh /tmp/install_setup/
119-
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_pgvector.sh
117+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_pgvector.sh
120118
121119
sudo apt-get update
122120
sudo apt-get install -qy \
@@ -128,17 +126,17 @@ jobs:
128126
libgeos-dev \
129127
130128
cp ./scripts/install_setup_postgis.sh /tmp/install_setup/
131-
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT PGVERSION=$PG_VERSION /tmp/install_setup/install_setup_postgis.sh
129+
sudo INSTALL_DEPENDENCIES_ROOT=$INSTALL_DEPENDENCIES_ROOT IVORYVERSION=$IVORY_VERSION /tmp/install_setup/install_setup_postgis.sh
132130
133131
- name: Export pg_config PATH
134132
run: |
135-
echo "/usr/lib/postgresql/${{ matrix.pg_version }}/bin" >> $GITHUB_PATH
133+
echo "/usr/lib/postgresql/${{ matrix.ivory_version }}/bin" >> $GITHUB_PATH
136134
137135
- name: Configure, Build and Install DocumentDB
138136
run: |
139137
which pg_config
140-
make
141-
sudo PATH=$PATH make install
138+
env "PATH=/var/local/ivorysql/ivory-4/bin:$PATH" make
139+
sudo env "PATH=/var/local/ivorysql/ivory-4/bin:$PATH" make install
142140
143141
- name: Run Tests
144142
run: |
@@ -147,11 +145,11 @@ jobs:
147145
export LANGUAGE=en_US
148146
export LC_COLLATE=en_US.UTF-8
149147
export LC_CTYPE=en_US.UTF-8
150-
make check
148+
env "PATH=/var/local/ivorysql/ivory-4/bin:$PATH" make check
151149
152150
- name: Citus Indent
153151
run: |
154-
citus_indent --check || (echo ""; echo "citus_indent failed, refer to CONTRIBUTING.md on how to use citus_indent"; exit 1)
152+
env "PATH=/var/local/ivorysql/ivory-4/bin:$PATH" citus_indent --check || (echo ""; echo "citus_indent failed, refer to CONTRIBUTING.md on how to use citus_indent"; exit 1)
155153
156154
- name: Validate sanity of files
157155
run: |
@@ -161,6 +159,6 @@ jobs:
161159
if: always()
162160
uses: actions/upload-artifact@v4
163161
with:
164-
name: logs_$${{ matrix.runner }}_PG${{ matrix.pg_version }}
162+
name: logs_$${{ matrix.runner }}_PG${{ matrix.ivory_version }}
165163
overwrite: true
166164
path: "**/*.log"

0 commit comments

Comments
 (0)