Store the PostgreSQL source code tags in the .pgtags file

orioledb · Aug 1, 2022 · ce37bf7 · ce37bf7
1 parent 38f5735
commit ce37bf7
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -20,16 +20,20 @@ jobs:
       CHECK_TYPE: ${{ matrix.check_type }}
       COMPILER: ${{ matrix.compiler }}
     steps:
+      - name: Checkout extension code into workspace directory
+        uses: actions/checkout@v2
+        with:
+          path: orioledb
+      - name: Get the required tag name
+        shell: bash
+        run: |
+          echo "PGTAG=$(grep '^${{ matrix.pg_version }}: ' orioledb/.pgtags | cut -d' ' -f2-)" >> $GITHUB_ENV
       - name: Checkout PostgreSQL code into workspace directory
         uses: actions/checkout@v2
         with:
           repository: orioledb/postgres
-          ref: patches${{ matrix.pg_version }}
+          ref: ${{ env.PGTAG }}
           path: postgresql
-      - name: Checkout extension code into workspace directory
-        uses: actions/checkout@v2
-        with:
-          path: orioledb
       - name: Setup prerequisites
         run: bash ./orioledb/ci/prerequisites.sh
       - name: Build
@@ -57,16 +61,20 @@ jobs:
       CHECK_TYPE: static
       COMPILER: ${{ matrix.compiler }}
     steps:
+      - name: Checkout extension code into workspace directory
+        uses: actions/checkout@v2
+        with:
+          path: orioledb
+      - name: Get the required tag name
+        shell: bash
+        run: |
+          echo "PGTAG=$(grep '^${{ matrix.pg_version }}: ' orioledb/.pgtags | cut -d' ' -f2-)" >> $GITHUB_ENV
       - name: Checkout PostgreSQL code into workspace directory
         uses: actions/checkout@v2
         with:
           repository: orioledb/postgres
-          ref: patches${{ matrix.pg_version }}
+          ref: ${{ env.PGTAG }}
           path: postgresql
-      - name: Checkout extension code into workspace directory
-        uses: actions/checkout@v2
-        with:
-          path: orioledb
       - name: Setup prerequisites
         run: bash ./orioledb/ci/prerequisites.sh
       - name: Build

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -12,6 +12,11 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v2
 
+      - name: Get the required tag name
+        shell: bash
+        run: |
+          echo "PGTAG=$(grep '^14: ' .pgtags | cut -d' ' -f2-)" >> $GITHUB_ENV
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
@@ -38,3 +43,5 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            PGTAG=${{ env.PGTAG }}
diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml
@@ -34,19 +34,24 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: orioledb/pgrpms
-          ref: orioledb-14
+          ref: orioledb
+      - name: Checkout extension code into workspace directory
+        uses: actions/checkout@v2
+        with:
+          path: orioledb
+      - name: Get the required tag name
+        shell: bash
+        run: |
+          echo "PGTAG=$(grep '^${{ github.event.inputs.version }}: ' orioledb/.pgtags | cut -d' ' -f2-)" >> $GITHUB_ENV
       - name: Checkout PostgreSQL code into workspace directory
         uses: actions/checkout@v2
         with:
           repository: orioledb/postgres
-          ref: patches${{ github.event.inputs.version }}
+          ref: ${{ env.PGTAG }}
           path: rpm/redhat/${{ github.event.inputs.version }}/postgresql-${{ github.event.inputs.version }}/EL-7/pgsrc
-      - name: Checkout extension code into workspace directory
-        uses: actions/checkout@v2
-        with:
-          path: rpm/redhat/${{ github.event.inputs.version }}/postgresql-${{ github.event.inputs.version }}/EL-7/pgsrc/contrib/orioledb
       - name: Archive sources
         run: |
+          mv orioledb rpm/redhat/${{ github.event.inputs.version }}/postgresql-${{ github.event.inputs.version }}/EL-7/pgsrc/contrib
           cd rpm/redhat/${{ github.event.inputs.version }}/postgresql-${{ github.event.inputs.version }}/EL-7
           tar -czf orioledb.tar.gz -C pgsrc .
           rm -rf pgsrc

diff --git a/.pgtags b/.pgtags
@@ -0,0 +1,3 @@
+13: patches13_1
+14: patches14_1
+15: patches15_1
diff --git a/Dockerfile b/Dockerfile
@@ -3,6 +3,9 @@
 
 FROM alpine:3.15
 
+ARG PGTAG
+ENV PGTAG $PGTAG
+
 # 70 is the standard uid/gid for "postgres" in Alpine
 # https://git.alpinelinux.org/aports/tree/main/postgresql/postgresql.pre-install?h=3.12-stable
 RUN set -eux; \
@@ -63,7 +66,7 @@ RUN set -eux; \
 	curl -o postgresql.tar.gz \
 			--header "Accept: application/vnd.github.v3.raw" \
 			--remote-name \
-			--location https://github.com/orioledb/postgres/tarball/patches14; \
+			--location https://github.com/orioledb/postgres/tarball/$PGTAG; \
 	mkdir -p /usr/src/postgresql; \
 	tar \
 		--extract \

diff --git a/README.md b/README.md
@@ -83,8 +83,8 @@ See [our dockerhub](https://hub.docker.com/r/orioledb/orioledb) for details.
 
 Before building and installing OrioleDB, one should ensure to have the following:
 
- * [PostgreSQL 13, 14 or 15 with extensibility patches](https://github.com/orioledb/postgres),
- * Development package of libzstd,
+ * [PostgreSQL with extensibility patches](https://github.com/orioledb/postgres): [13 (tag: patches13_1)](https://github.com/orioledb/postgres/tree/patches13_1), [14 (tag: patches14_1)](https://github.com/orioledb/postgres/tree/patches14_1) or [15 (tag: patches15_1)](https://github.com/orioledb/postgres/tree/patches15_1);
+ * Development package of libzstd;
  * python 3.5+ with testgres package.
 
 Typical installation procedure may look like this: