admin/frappe_docker
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

resolve merge conflicts

Browse Source
This commit is contained in:
chabad360
2020-03-05 01:43:50 +00:00
parent 2d459987c3 1843e8a642
commit d6e012e9c0
7 changed files with 313 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.travis.yml
View File

@@ -1,6 +1,6 @@
sudo: required
dist: xenial
dist: bionic
services:
- docker
@@ -23,7 +23,7 @@ jobs:
- stage: "Build Frappe python environment (edge)"
if: branch = develop AND type != pull_request
script:
- ./travis.py frappe --worker --tag edge
- ./travis.py frappe --worker --tag edge
- ./travis.py frappe --worker --tag develop --tag-only
- stage: "Build Frappe nginx + static assets (edge)"
if: branch = develop AND type != pull_request
@@ -38,7 +38,7 @@ jobs:
- stage: "Build ERPNext nginx + static assets (edge)"
if: branch = develop AND type != pull_request
script:
- ./travis.py erpnext --nginx --tag edge
- ./travis.py erpnext --nginx --tag edge
- ./travis.py erpnext --nginx --tag develop --tag-only
- stage: "Build Frappe socketio service (edge)"
if: branch = develop AND type != pull_request
@@ -48,13 +48,13 @@ jobs:
- stage: "Build Frappe python environment (v12)"
if: branch = master AND type != pull_request
script:
- ./travis.py frappe --worker --git-branch 12
- ./travis.py frappe --worker --git-branch 12
- ./travis.py frappe --worker --tag v12 --tag-only
- ./travis.py frappe --worker --tag version-12 --tag-only
- stage: "Build Frappe nginx + static assets (v12)"
if: branch = master AND type != pull_request
script:
- ./travis.py frappe --nginx --git-branch 12
- ./travis.py frappe --nginx --git-branch 12
- ./travis.py frappe --nginx --tag v12 --tag-only
- ./travis.py frappe --nginx --tag version-12 --tag-only
- stage: "Build ERPNext python environment (v12)"
@@ -78,13 +78,13 @@ jobs:
- stage: "Build Frappe python environment (v11)"
if: branch = master AND type != pull_request
script:
- ./travis.py frappe --worker --git-branch 11
- ./travis.py frappe --worker --git-branch 11
- ./travis.py frappe --worker --tag v11 --tag-only
- ./travis.py frappe --worker --tag version-11 --tag-only
- stage: "Build Frappe nginx + static assets (v11)"
if: branch = master AND type != pull_request
script:
- ./travis.py erpnext frappe --nginx --git-branch 11
- ./travis.py erpnext frappe --nginx --git-branch 11
- ./travis.py erpnext frappe --nginx --tag v11 --tag-only
- ./travis.py erpnext frappe --nginx --tag version-11 --tag-only
- stage: "Build ERPNext python environment (v11)"
@@ -105,5 +105,3 @@ jobs:
- ./travis.py frappe --socketio --git-branch 11
- ./travis.py frappe --socketio --tag v11 --tag-only
- ./travis.py frappe --socketio --tag version-11 --tag-only