From f14b8b695487b8fb052137baa80c7e5ca900a1a0 Mon Sep 17 00:00:00 2001
From: Lev <mail@vrslev.com>
Date: Tue, 23 Nov 2021 16:04:17 +0300
Subject: [PATCH] update

---
 .github/workflows/build_develop.yml | 36 ++++-------------------------
 docker-bake.hcl                     | 10 ++++++--
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build_develop.yml b/.github/workflows/build_develop.yml
index 90f9876c..2919986b 100644
--- a/.github/workflows/build_develop.yml
+++ b/.github/workflows/build_develop.yml
@@ -72,50 +72,24 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build
+      - name: Build Frappe
         uses: docker/bake-action@v1.6.0
         with:
           files: docker-bake.hcl
           targets: frappe-develop-test
           load: true
 
-      - name: Test
+      - name: Test Frappe
         run: ./tests/test-frappe.sh
 
-      - name: Push
-        if: env.IS_AUTHORIZED_RUN == 'true'
-        uses: docker/bake-action@v1.6.0
-        with:
-          files: docker-bake.hcl
-          targets: frappe-develop
-          push: true
-
-  build_erpnext:
-    name: ERPNext
-    runs-on: ubuntu-latest
-    needs: build_frappe
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login
-        uses: docker/login-action@v1
-        if: env.IS_AUTHORIZED_RUN == 'true'
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build
+      - name: Build ERPNext
         uses: docker/bake-action@v1.6.0
         with:
           files: docker-bake.hcl
           targets: erpnext-develop-test
           load: true
 
-      - name: Test
+      - name: Test ERPNext
         run: FRAPPE_VERSION=develop ./tests/test-erpnext.sh
 
       - name: Push
@@ -123,5 +97,5 @@ jobs:
         uses: docker/bake-action@v1.6.0
         with:
           files: docker-bake.hcl
-          targets: erpnext-develop
+          targets: frappe-develop,erpnext-develop
           push: true
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 43a9a460..87c64f85 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -53,6 +53,12 @@ target "stable-args" {
     }
 }
 
+target "test-erpnext-args" {
+    args = {
+        IMAGE_TAG = "test"
+    }
+}
+
 function "set_develop_tags" {
     params = [repo]
     result = ["${repo}:latest", "${repo}:edge", "${repo}:develop"]
@@ -122,12 +128,12 @@ target "frappe-socketio-develop-test" {
 }
 
 target "erpnext-nginx-develop-test" {
-    inherits = ["erpnext-nginx-develop"]
+    inherits = ["erpnext-nginx-develop", "test-erpnext-args"]
     tags = set_test_tags("frappe/erpnext-nginx")
 }
 
 target "erpnext-worker-develop-test" {
-    inherits = ["erpnext-worker-develop"]
+    inherits = ["erpnext-worker-develop", "test-erpnext-args"]
     tags = set_test_tags("frappe/erpnext-worker")
 }