This commit is contained in:
Lev 2021-11-23 17:10:23 +03:00
parent f9608e4d15
commit fdd12f6ec3
2 changed files with 21 additions and 21 deletions

View file

@ -79,13 +79,23 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }} username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }} password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build Frappe and push to local registry - name: Build Frappe
uses: docker/bake-action@v1.6.0 uses: docker/bake-action@v1.6.0
with: with:
files: docker-bake.hcl files: docker-bake.hcl
targets: frappe-develop-test-localhost targets: frappe-develop-test
load: true
- name: Push Frappe to local registry
uses: docker/bake-action@v1.6.0
with:
files: docker-bake.hcl
targets: frappe-develop-test-local
push: true push: true
- name: Test Frappe
run: ./tests/test-frappe.sh
- name: Build ERPNext - name: Build ERPNext
uses: docker/bake-action@v1.6.0 uses: docker/bake-action@v1.6.0
with: with:
@ -93,16 +103,6 @@ jobs:
targets: erpnext-develop-test targets: erpnext-develop-test
load: true load: true
- name: Load Frappe
uses: docker/bake-action@v1.6.0
with:
files: docker-bake.hcl
targets: frappe-develop-test
load: true
- name: Test Frappe
run: ./tests/test-frappe.sh
- name: Test ERPNext - name: Test ERPNext
run: FRAPPE_VERSION=develop ./tests/test-erpnext.sh run: FRAPPE_VERSION=develop ./tests/test-erpnext.sh

View file

@ -81,7 +81,7 @@ target "test-erpnext-args" {
} }
} }
function "set_localhost_test_tags" { function "set_local_test_tags" {
params = [repo] params = [repo]
result = ["localhost:5000/${repo}:test"] result = ["localhost:5000/${repo}:test"]
} }
@ -129,19 +129,19 @@ group "erpnext-develop" {
# Test develop images # Test develop images
target "frappe-nginx-develop-test-localhost" { target "frappe-nginx-develop-test-local" {
inherits = ["frappe-nginx-develop"] inherits = ["frappe-nginx-develop"]
tags = set_localhost_test_tags("frappe/frappe-nginx") tags = set_local_test_tags("frappe/frappe-nginx")
} }
target "frappe-worker-develop-test-localhost" { target "frappe-worker-develop-test-local" {
inherits = ["frappe-worker-develop"] inherits = ["frappe-worker-develop"]
tags = set_localhost_test_tags("frappe/frappe-worker") tags = set_local_test_tags("frappe/frappe-worker")
} }
target "frappe-socketio-develop-test-localhost" { target "frappe-socketio-develop-test-local" {
inherits = ["frappe-socketio-develop"] inherits = ["frappe-socketio-develop"]
tags = set_localhost_test_tags("frappe/frappe-socketio") tags = set_local_test_tags("frappe/frappe-socketio")
} }
target "frappe-nginx-develop-test" { target "frappe-nginx-develop-test" {
@ -169,8 +169,8 @@ target "erpnext-worker-develop-test" {
tags = set_test_tags("frappe/erpnext-worker") tags = set_test_tags("frappe/erpnext-worker")
} }
group "frappe-develop-test-localhost" { group "frappe-develop-test-local" {
targets = ["frappe-nginx-develop-test-localhost", "frappe-worker-develop-test-localhost", "frappe-socketio-develop-test-localhost"] targets = ["frappe-nginx-develop-test-local", "frappe-worker-develop-test-local", "frappe-socketio-develop-test-local"]
} }
group "frappe-develop-test" { group "frappe-develop-test" {