Merge pull request #213 from phillipross/feature/ci

CI: Disable travis-ci and enable github actions

Author: phillipross

.github/workflows/main.yml

@@ -0,0 +1,50 @@
+name: Docker PostGIS CI
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '15 5 * * 1'
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  make-docker-images:
+    strategy:
+      matrix:
+        postgres: [9.5, 9.6, 10, 11, 12, 13]
+        postgis: ['2.5', '3.0']
+        variant: [default, alpine]
+        exclude:
+          - postgres: 13
+            postgis: '2.5'
+        include:
+          - postgres: 12
+            postgis: master
+            variant: default
+          - postgres: 13
+            postgis: master
+            variant: default
+    name: Build docker image for ${{ matrix.postgres }}-${{ matrix.postgis }} variant ${{ matrix.variant }}
+    runs-on: ubuntu-20.04
+    continue-on-error: ${{ matrix.postgis == 'master' }}
+    env:
+      VERSION: ${{ matrix.postgres }}-${{ matrix.postgis }}
+      VARIANT: ${{ matrix.variant }}
+
+    steps:
+    - name: Checkout source
+      uses: actions/checkout@v2
+
+    - name: Build docker image for ${{ env.VERSION }} ${{ env.VARIANT }}
+      run: make test
+
+#    - name: Push docker image to dockerhub
+#      env:
+#        DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+#        DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+#        DOCKERHUB_ACCESS_TOKEN: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
+#      run: echo "$DOCKERHUB_ACCESS_TOKEN" | docker login -u $DOCKERHUB_USERNAME --password-stdin && make push
+

.travis.yml renamed to .travis.yml.disabled

@@ -12,20 +12,22 @@ do_default=true
 do_alpine=true
 
 # The following logic evaluates VERSION and VARIANT variables that may have
-# been previously specified, and unsets the "do" flags depending on the values.
+# been previously specified, and modifies the "do" flags depending on the values.
 # The VERSIONS variable is also set to contain the version(s) to be processed.
 ifdef VERSION
-    VERSIONS=$(VERSION) # If a version was speciefied, VERSIONS only contains the specified version
-    ifdef VARIANT
-        do_default=false             # If a variant was specified as an environment variable, don't process the default
-        ifneq ($(VARIANT),alpine)
-            do_alpine=false          # If alpine variant was specified as an environment variable, process the alpine variant
+    VERSIONS=$(VERSION) # If a version was specified, VERSIONS only contains the specified version
+    ifdef VARIANT       # If a variant is specified, unset all do flags and allow subsequent logic to set them again where appropriate
+        do_default=false
+        do_alpine=false
+        ifeq ($(VARIANT),default)
+            do_default=true
+        endif
+        ifeq ($(VARIANT),alpine)
+            do_alpine=true
         endif
-    else
-       do_alpine=false               # If no variant was specified, don't process the alpine variant
     endif
-    ifeq ("$(wildcard $(VERSION)/alpine)","")
-        do_alpine=false              # If no alpine subdirectory exists, don't process the alpine version
+    ifeq ("$(wildcard $(VERSION)/alpine)","") # If no alpine subdirectory exists, don't process the alpine version
+        do_alpine=false
     endif
 else # If no version was specified, VERSIONS should contain all versions
     VERSIONS = $(foreach df,$(wildcard */Dockerfile),$(df:%/Dockerfile=%))

Makefile

@@ -107,5 +107,7 @@ for version in "${versions[@]}"; do
 
 done
 travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"
-echo "$travis" > .travis.yml
+
+# *** TRAVIS IS DISABLED FOR NOW ***
+#echo "$travis" > .travis.yml