Fix mix editor did not get the materials from the correct location in update mode

This commit is contained in:
FyloZ 2021-12-23 21:03:58 -05:00
parent 23b80daa75
commit f21157d283
Signed by: william
GPG Key ID: 835378AE9AF4AE97
1 changed files with 23 additions and 13 deletions

View File

@ -1,6 +1,6 @@
--- ---
global-variables: global-variables:
release: &release ${DRONE_BRANCH##**/} release: &release ${DRONE_TAG}
environment: &environment environment: &environment
CRE_REGISTRY_IMAGE: registry.fyloz.dev:5443/colorrecipesexplorer/frontend CRE_REGISTRY_IMAGE: registry.fyloz.dev:5443/colorrecipesexplorer/frontend
CRE_PORT: 9102 CRE_PORT: 9102
@ -21,6 +21,9 @@ steps:
- echo -n "latest" > .tags - echo -n "latest" > .tags
when: when:
branch: develop branch: develop
event:
exclude:
- pull_request
- name: set-docker-tags-release - name: set-docker-tags-release
image: *alpine-image image: *alpine-image
@ -29,18 +32,30 @@ steps:
commands: commands:
- echo -n "latest-release,$CRE_RELEASE" > .tags - echo -n "latest-release,$CRE_RELEASE" > .tags
when: when:
branch: release/** event:
- tag
- name: containerize - name: containerize-dev
image: plugins/docker image: plugins/docker
environment: environment:
<<: *environment <<: *environment
settings: settings:
repo: *docker-registry-repo repo: *docker-registry-repo
when: when:
branch: branch: develop
- develop event:
- release/** exclude:
- pull_request
- name: containerize-release
image: plugins/docker
environment:
<<: *environment
settings:
repo: *docker-registry-repo
when:
event:
- tag
- name: deploy - name: deploy
image: alpine:latest image: alpine:latest
@ -70,10 +85,5 @@ steps:
- ssh -p $DEPLOY_SERVER_SSH_PORT $DEPLOY_SERVER_USERNAME@$DEPLOY_SERVER "docker pull $CRE_REGISTRY_IMAGE:$CRE_RELEASE" - ssh -p $DEPLOY_SERVER_SSH_PORT $DEPLOY_SERVER_USERNAME@$DEPLOY_SERVER "docker pull $CRE_REGISTRY_IMAGE:$CRE_RELEASE"
- ssh -p $DEPLOY_SERVER_SSH_PORT $DEPLOY_SERVER_USERNAME@$DEPLOY_SERVER "docker run -d -p $CRE_PORT:80 --name=$DEPLOY_CONTAINER_NAME $CRE_REGISTRY_IMAGE:$CRE_RELEASE" - ssh -p $DEPLOY_SERVER_SSH_PORT $DEPLOY_SERVER_USERNAME@$DEPLOY_SERVER "docker run -d -p $CRE_PORT:80 --name=$DEPLOY_CONTAINER_NAME $CRE_REGISTRY_IMAGE:$CRE_RELEASE"
when: when:
branch: release/** event:
- tag
trigger:
branch:
- develop
- release/**
- master