Merge remote-tracking branch 'upstream/develop' into install_app
This commit is contained in:
13
.travis.yml
13
.travis.yml
@@ -20,12 +20,17 @@ after_success:
|
||||
|
||||
jobs:
|
||||
include:
|
||||
- stage: "Build Frappe python environment (edge)"
|
||||
- name: "Build Frappe bench development environment (latest)"
|
||||
if: branch = develop AND type != pull_request
|
||||
script:
|
||||
- ./travis.py frappe --worker --tag edge
|
||||
- ./travis.py frappe --worker --tag develop --tag-only
|
||||
- stage: "Build Frappe nginx + static assets (edge)"
|
||||
- docker build -t frappe/bench:latest -f build/bench/Dockerfile .
|
||||
- docker push frappe/bench:latest
|
||||
- name: "Build Frappe python environment (edge)"
|
||||
if: branch = develop AND type != pull_request
|
||||
script:
|
||||
- ./travis.py frappe --nginx --tag edge
|
||||
- ./travis.py frappe --nginx --tag develop--tag-only
|
||||
- name: "Build Frappe nginx + static assets (edge)"
|
||||
if: branch = develop AND type != pull_request
|
||||
script:
|
||||
- ./travis.py frappe --nginx --tag edge
|
||||
|
||||
Reference in New Issue
Block a user