Merge branch 'master' into feature/dependabot-actions

.github/workflows/nightly-build beta-v5.9.yml

@@ -0,0 +1,69 @@
+name: Build & Deploy Nightly images
+on:
+  schedule:
+    - cron: '0 1 * * *'
+
+jobs:
+  test-and-build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ARCH: [amd64, armhf, arm64, i386]
+        DEBIAN_VERSION: [stretch, buster]
+    env:
+      ARCH: ${{matrix.ARCH}}
+      DEBIAN_VERSION: ${{matrix.DEBIAN_VERSION}}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+        with:
+          ref: dev
+      - name: Patching Versions File
+        run: |
+          git checkout -b beta-v5.9
+          echo "CORE_VERSION=release/v5.4" > VERSIONS
+          echo "WEB_VERSION=release/v5.6" >> VERSIONS
+          echo "FTL_VERSION=release/v5.9" >> VERSIONS
+      - name: Run Tests
+        run: |
+          echo "Building ${ARCH}-${DEBIAN_VERSION}"
+          ./gh-actions-test.sh
+      - name: Push the ARCH image
+        if: github.event_name != 'pull_request'
+        run: |
+          . gh-actions-vars.sh
+          echo "${{ secrets.DOCKERHUB_PASS }}" | docker login --username="${{ secrets.DOCKERHUB_USER }}" --password-stdin
+          docker push "${ARCH_IMAGE}"
+      - name: Upload gh-workspace
+        if: github.event_name != 'pull_request'
+        uses: actions/upload-artifact@v1
+        with:
+          name: gh-workspace
+          path: .gh-workspace
+
+  publish:
+    runs-on: ubuntu-latest
+    needs: test-and-build
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v2
+        with:
+          ref: dev
+      - name: Patching Versions File
+        run: |
+          git checkout -b beta-v5.9
+          echo "CORE_VERSION=release/v5.4" > VERSIONS
+          echo "WEB_VERSION=release/v5.6" >> VERSIONS
+          echo "FTL_VERSION=release/v5.9" >> VERSIONS
+      - name: Download workspace files
+        uses: actions/download-artifact@v1
+        with:
+          name: gh-workspace
+          path: .gh-workspace
+      - name: Tag and Publish multi-arch images
+        env:
+          DOCKERHUB_PASS: ${{ secrets.DOCKERHUB_PASS }}
+          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
+        run: |
+          ./gh-actions-deploy.sh

.github/workflows/workflow_dispatch.yml

@@ -2,6 +2,10 @@ name: Build & Deploy custom image manually
 on:
   workflow_dispatch:
     inputs:
+      branch:
+        description: "Name of Branch to base build on"
+        required: false
+        default: dev
       name:
         description: 'Name of tag'
         required: true
@@ -30,7 +34,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
         with:
-          ref: dev
+          ref: ${{ github.event.inputs.branch }}
       - name: Patching Versions File
         run: |
           git checkout -b ${{ github.event.inputs.name }}