test / refactor

Author: ImreSamu

.github/workflows/buildx.yml

@@ -7,9 +7,9 @@ name: buildx-qemu-experimental-build
 # Expecting: upstream "postgres" docker images for OS/ARCH=platforms
 #   [ check https://hub.docker.com/_/postgres/tags ]
 #
-# Comments: 2022-09-07  ( with QEMU 7.0 )
-#   'linux/arm64'    Postgres JIT is not working; ( SET JIT=OFF under the alpine test )
-#   'linux/ppc64le'  Postgres JIT is not working; ( SET JIT=OFF under the alpine test ) 
+# Comments: ( with QEMU 7.0 / 2022-october )
+#   'linux/arm64'    Postgres JIT is not working; ( SET JIT=OFF under the alpine test ; see alpine template )
+#   'linux/ppc64le'  Postgres JIT is not working; ( SET JIT=OFF under the alpine test ; see alpine template )
 #   'linux/arm/v7' - debian: Unable to locate package postgresql-??-postgis-3;
 #   'linux/arm/v6' - debian: Unable to locate package postgresql-??-postgis-3;
 #   'linux/s390x'    [alpine|debian] failed test.
@@ -35,7 +35,7 @@ jobs:
       matrix:
         # succesful tests matrix:
         platforms: ['linux/arm64','linux/arm/v7','linux/arm/v6','linux/386','linux/ppc64le']
-        postgres: [ 15 ]
+        postgres: [ 10, 15 ]
         postgis: ['3.3']
         variant: [alpine]
         include:
@@ -47,6 +47,15 @@ jobs:
             postgis: '3.3'
             variant: 'default'
             platforms: 'linux/ppc64le'
+          - postgres: 10
+            postgis: '3.3'
+            variant: 'default'
+            platforms: 'linux/arm64'
+          - postgres: 10
+            postgis: '3.3'
+            variant: 'default'
+            platforms: 'linux/ppc64le'
+
 
     name: ${{ matrix.platforms }} ${{ matrix.postgres }}-${{ matrix.postgis }} ${{ matrix.variant }}
     runs-on: ubuntu-latest
@@ -57,7 +66,7 @@ jobs:
       # Not the default (main) workflow!
       WORKFLOW: buildx
       # Docker image tag postfix
-      TAG_POSTFIX: '-experimental'
+      TAG_POSTFIX: '-buildx'
 
     steps:
 

Makefile

@@ -1,4 +1,11 @@
 
+# Used environmnet variables:
+#      VERSION:     15-3.3,14-3.3,13-3.3, ...
+#      VARIANT:     <<empty>>, alpine             ( debian or alpine )
+#      WORKFLOW:    main,buildx                   ( workflow id )
+#      TAG_POSTFIX: <<empty>>,'-experimental'     ( Docker image tag postfix )
+#
+
 # When processing the rules for tagging and pushing container images with the
 # "latest" tag, the following variable will be the version that is considered
 # to be the latest.
@@ -13,13 +20,14 @@ do_alpine=true
 
 # There are multiple workflows in the  .github/workflows/*
 # The default WORKFLOW is the main.yml ( amd64 ) but can be overriden via environment variables.
-
 WORKFLOW ?= main
-TAG_POSTFIX=
 
-# IF this is not the 'main' workflow THEN We add special image tag postfix. ( -experimental )
-ifneq ($(WORKFLOW),main)
-   TAG_POSTFIX=-experimental
+# IF this is NOT the 'main' workflow THEN we add special image tag postfix.
+#  ( -experimental ; it can be overriden via environment variables. )
+ifeq ($(WORKFLOW),main)
+   TAG_POSTFIX ?=
+else
+   TAG_POSTFIX ?= -experimental
 endif
 
 # The following logic evaluates VERSION and VARIANT variables that may have