From f71480f97d3882cadc0564e3ca48038e9a2ddbdf Mon Sep 17 00:00:00 2001
From: Xiaonan Shen <s@sxn.dev>
Date: Thu, 19 Nov 2020 17:57:37 -0800
Subject: [PATCH 1/3] Migrate to build-push-action@v2

---
 .github/workflows/main.yaml | 30 +++++++++++++++++++++++-------
 set-env.sh                  | 11 -----------
 2 files changed, 23 insertions(+), 18 deletions(-)
 delete mode 100644 set-env.sh

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 1ac1969..a75299a 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -12,11 +12,11 @@ on:
       - entrypoint.sh
       - gpgparams
       - install.sh
-      - set-env.sh
       - VERSION
 
 env:
   DOCKER_REPO: shenxn/protonmail-bridge
+  DOCKER_REPO_DEV: shenxn/protonmail-bridge-dev
 
 jobs:
   build:
@@ -24,12 +24,28 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@master
-      - name: Set Env
-        run: bash set-env.sh
-      - uses: docker/build-push-action@v1
+      - name: Set version
+        id: version
+        run: echo "::set-output name=version::`cat VERSION`"
+      - name: Set repo
+        id: repo
+        run: if [[ $GITHUB_REF == "refs/heads/master" ]]; then echo "::set-output name=repo::${DOCKER_REPO}"; else echo "::set-output name=repo::${DOCKER_REPO_DEV}"; fi
+      - name: Docker meta
+        id: docker_meta
+        uses: crazy-max/ghaction-docker-meta@v1
+        with:
+          images: ${{ steps.repo.outputs.repo }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to DockerHub
+        uses: docker/login-action@v1 
         with:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
-          repository: shenxn/protonmail-bridge
-          tags: ${{ env.TAGS }}
-          add_git_labels: true
+      - uses: docker/build-push-action@v2
+        with:
+          tags: |
+            ${{ steps.repo.outputs.repo }}:latest
+            ${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          push: true
diff --git a/set-env.sh b/set-env.sh
deleted file mode 100644
index 359c7a3..0000000
--- a/set-env.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-VERSION=`cat VERSION`
-
-if [[ $GITHUB_REF == "refs/heads/master" ]]; then
-    echo "TAGS=latest,${VERSION}" >> $GITHUB_ENV
-else
-    echo "TAGS=dev,${VERSION}-dev" >> $GITHUB_ENV
-fi

From 7fe4530b84510e23cb7a33fb3787658e985482d5 Mon Sep 17 00:00:00 2001
From: Xiaonan Shen <s@sxn.dev>
Date: Thu, 19 Nov 2020 18:09:25 -0800
Subject: [PATCH 2/3] Run main action on pull requests

---
 .github/workflows/main.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index a75299a..aca470c 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -13,6 +13,7 @@ on:
       - gpgparams
       - install.sh
       - VERSION
+  pull_request:
 
 env:
   DOCKER_REPO: shenxn/protonmail-bridge
@@ -48,4 +49,4 @@ jobs:
             ${{ steps.repo.outputs.repo }}:latest
             ${{ steps.repo.outputs.repo }}:${{ steps.version.outputs.version }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}

From 32b3541906cc124c2a2c1254d36b4e76d29ca85b Mon Sep 17 00:00:00 2001
From: Xiaonan Shen <s@sxn.dev>
Date: Thu, 19 Nov 2020 18:16:13 -0800
Subject: [PATCH 3/3] Do not login for pull requests

---
 .github/workflows/main.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index aca470c..cdccfd5 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -39,7 +39,8 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
       - name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v1
+        if: ${{ github.event_name != 'pull_request' }}
         with:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_PASSWORD }}