From 2fbbc0fb62d9d1b93afde1b9ed43ed52d09ae2a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Srokosz?= <pawel.srokosz@cert.pl>
Date: Wed, 27 Jul 2022 15:02:04 +0100
Subject: [PATCH] Version bump to 1.2.0 and update CI workflows (#16)

---
 .github/workflows/publish.yml       | 17 ++++++++++++-----
 .github/workflows/release.yml       | 28 +++++++++++++++++++++++++---
 karton/autoit_ripper/__version__.py |  2 +-
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 7e9a37a..9970482 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -15,12 +15,19 @@ jobs:
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
-      - name: Build and push the image
-        uses: docker/build-push-action@v1.1.0
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Docker Hub
+        if: ${{ github.event_name == 'push' }}
+        uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: ./Dockerfile
-          repository: certpl/${{ github.event.repository.name }}
-          tags: ${{ github.sha }}
+      - name: Build and push the image
+        uses: docker/build-push-action@v2.2.1
+        with:
+          tags: |
+            certpl/${{ github.event.repository.name }}:${{ github.sha }}
           push: ${{ github.event_name == 'push' }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5c44d28..40933b5 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,11 +1,11 @@
 name: Release a new version
 
 on:
-  push:
-    tags: 'v*.*.*'
+  release:
+    types: [published]
 
 jobs:
-  release:
+  release_pypi:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -18,3 +18,25 @@ jobs:
       with:
         user: __token__
         password: ${{ secrets.pypi_password }}
+  release_dockerhub:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to Docker Hub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build and push the image
+        uses: docker/build-push-action@v2.2.1
+        with:
+          tags: |
+            certpl/${{ github.event.repository.name }}:${{ github.sha }}
+            certpl/${{ github.event.repository.name }}:${{ github.event.release.tag_name }}
+            certpl/${{ github.event.repository.name }}:latest
+          push: true
diff --git a/karton/autoit_ripper/__version__.py b/karton/autoit_ripper/__version__.py
index 6849410..c68196d 100644
--- a/karton/autoit_ripper/__version__.py
+++ b/karton/autoit_ripper/__version__.py
@@ -1 +1 @@
-__version__ = "1.1.0"
+__version__ = "1.2.0"