From 118afc0261da9fc6968d54a2fe3279137a035723 Mon Sep 17 00:00:00 2001
From: Stefan Negru <stefan@blankdots.com>
Date: Wed, 4 Nov 2020 20:36:05 +0200
Subject: [PATCH 1/2] refactor and update gh-actions

---
 .github/workflows/publish.yml | 70 +++++++++++++++++++++++------------
 .github/workflows/style.yml   |  4 +-
 2 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e46183c..7f95d9a 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,27 +11,49 @@ jobs:
     name: Push swift upload runner Docker image to Docker Hub
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: Login to DockerHub Registry
-        run: echo '${{ secrets.DOCKER_PASSWORD }}' | docker login -u '${{ secrets.DOCKER_USERNAME }}' --password-stdin
-      - name: Get the version
-        id: vars
-        run: echo ::set-output name=tag::$(echo ${GITHUB_REF:10})
-      - name: Build the tagged Docker image
-        if:  ${{ steps.vars.outputs.tag != '/master' && steps.vars.outputs.tag != '/devel' }}
-        run: docker build . --file Dockerfile --tag cscfi/swiftui-upload-runner:${{steps.vars.outputs.tag}}
-      - name: Push the tagged Docker image
-        if:  ${{ steps.vars.outputs.tag != '/master' && steps.vars.outputs.tag != '/devel' }}
-        run: docker push cscfi/swiftui-upload-runner:${{steps.vars.outputs.tag}}
-      - name: Build the latest Docker image
-        if:  ${{ steps.vars.outputs.tag == '/master' }}
-        run: docker build . --file Dockerfile --tag cscfi/swiftui-upload-runner:latest
-      - name: Push the latest Docker image
-        if:  ${{ steps.vars.outputs.tag == '/master' }}
-        run: docker push cscfi/swiftui-upload-runner:latest
-      - name: Build the stage Docker image
-        if:  ${{ steps.vars.outputs.tag == '/devel' }}
-        run: docker build . --file Dockerfile --tag cscfi/swiftui-upload-runner:stage
-      - name: Push the stage Docker image
-        if:  ${{ steps.vars.outputs.tag == '/devel' }}
-        run: docker push cscfi/swiftui-upload-runner:stage
+      - name: Check out the repo
+        uses: actions/checkout@v2
+
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=cscfi/swiftui-upload-runner
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          elif [[ $GITHUB_REF == refs/heads/* ]]; then
+            BRANCH=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
+            if [[ $BRANCH == master ]]; then
+              VERSION=latest
+            elif [[ $BRANCH == devel ]]; then
+              VERSION=stage
+            fi
+          fi
+          TAGS="${DOCKER_IMAGE}:${VERSION}"
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      
+      - name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          cache-from: type=registry,ref=cscfi/swiftui-upload-runner:latest
+          cache-to: type=inline
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.clone_url }}
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}
diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index 501b579..8bb78cb 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -13,9 +13,9 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

From dd1f4ebf1c7635caf254285e3808794b62297558 Mon Sep 17 00:00:00 2001
From: Stefan Negru <stefan@blankdots.com>
Date: Wed, 4 Nov 2020 20:42:23 +0200
Subject: [PATCH 2/2] bump to version 0.1.4

---
 swift_upload_runner/__init__.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/swift_upload_runner/__init__.py b/swift_upload_runner/__init__.py
index b848015..1c4780b 100644
--- a/swift_upload_runner/__init__.py
+++ b/swift_upload_runner/__init__.py
@@ -1,6 +1,6 @@
 """Runner for swift-browser-ui upload and replication operations."""
 
-__name__ = 'swift_upload_runner'
-__version__ = '0.1.3'
-__author__ = 'CSC Developers'
-__license__ = 'MIT License'
+__name__ = "swift_upload_runner"
+__version__ = "0.1.4"
+__author__ = "CSC Developers"
+__license__ = "MIT License"