Upd: Simplify GitHub actions.

thienohs · May 29, 2021 · af7438a · af7438a
1 parent 15dab4c
commit af7438a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -101,17 +101,17 @@ jobs:
           build-args: |
             BASE_IMAGE=alpine:latest
 
-#      - name: Build and push Ubuntu
-#        uses: docker/build-push-action@v2
-#        with:
-#          context: .
-#          push: true
-#          tags: boky/postfix:latest-ubuntu
-#          platforms: "linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x"
-#          cache-from: type=local,src=/tmp/.buildx-cache/ubuntu
-#          cache-to: type=local,dest=/tmp/.buildx-cache-new/ubuntu
-#          build-args: |
-#            BASE_IMAGE=ubuntu:focal
+      - name: Build and push Ubuntu
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: boky/postfix:latest-ubuntu
+          platforms: "linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x"
+          cache-from: type=local,src=/tmp/.buildx-cache/ubuntu
+          cache-to: type=local,dest=/tmp/.buildx-cache-new/ubuntu
+          build-args: |
+            BASE_IMAGE=ubuntu:focal
 
       - name: Move cache
         run: |

diff --git a/.github/workflows/tags.yml b/.github/workflows/tags.yml
@@ -101,17 +101,17 @@ jobs:
           build-args: |
             BASE_IMAGE=alpine:latest
 
-#      - name: Build and push Ubuntu
-#        uses: docker/build-push-action@v2
-#        with:
-#          context: .
-#          push: true
-#          tags: boky/postfix:${{ env.RELEASE_VERSION }}-ubuntu
-#          platforms: "linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x"
-#          cache-from: type=local,src=/tmp/.buildx-cache/ubuntu
-#          cache-to: type=local,dest=/tmp/.buildx-cache-new/ubuntu
-#          build-args: |
-#            BASE_IMAGE=ubuntu:focal
+      - name: Build and push Ubuntu
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          push: true
+          tags: boky/postfix:${{ env.RELEASE_VERSION }}-ubuntu
+          platforms: "linux/amd64,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x"
+          cache-from: type=local,src=/tmp/.buildx-cache/ubuntu
+          cache-to: type=local,dest=/tmp/.buildx-cache-new/ubuntu
+          build-args: |
+            BASE_IMAGE=ubuntu:focal
 
       - name: Move cache
         run: |