Merge pull request 'product-development' (#29) from product-development into master
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Reviewed-on: #29
This commit is contained in:
commit
b126796747
43
.drone.yml
43
.drone.yml
|
@ -82,8 +82,32 @@ steps:
|
|||
- master
|
||||
image: alpine/git:latest
|
||||
commands:
|
||||
- git config credential.helper '!f() { sleep 1; echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"; }; f'
|
||||
- git fetch
|
||||
- git checkout deployed
|
||||
- git merge master
|
||||
environment:
|
||||
GIT_PASSWORD:
|
||||
from_secret: GIT_PASSWORD
|
||||
GIT_USER:
|
||||
from_secret: GIT_USER
|
||||
|
||||
- name: "check out product-development"
|
||||
when:
|
||||
branch:
|
||||
- format-branch
|
||||
image: alpine/git:latest
|
||||
commands:
|
||||
- git config credential.helper '!f() { sleep 1; echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"; }; f'
|
||||
- git fetch
|
||||
- git checkout product-development
|
||||
- git merge format-branch
|
||||
environment:
|
||||
GIT_PASSWORD:
|
||||
from_secret: GIT_PASSWORD
|
||||
GIT_USER:
|
||||
from_secret: GIT_USER
|
||||
|
||||
- name: "convert to xml"
|
||||
image: sigyl/zone-10-batch2yaml:latest
|
||||
when:
|
||||
|
@ -104,6 +128,17 @@ steps:
|
|||
volumes:
|
||||
- name: dockersock
|
||||
path: /var/run
|
||||
- name: "git - status"
|
||||
when:
|
||||
branch:
|
||||
- master
|
||||
- format-branch
|
||||
image: alpine/git:latest
|
||||
commands:
|
||||
- git status
|
||||
volumes:
|
||||
- name: dockersock
|
||||
path: /var/run
|
||||
- name: "git - deployed"
|
||||
when:
|
||||
branch:
|
||||
|
@ -111,9 +146,15 @@ steps:
|
|||
- format-branch
|
||||
image: alpine/git:latest
|
||||
commands:
|
||||
- git config credential.helper '!f() { sleep 1; echo "username=${GIT_USER}"; echo "password=${GIT_PASSWORD}"; }; f'
|
||||
- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
|
||||
- git add -A
|
||||
- git commit -m '$${DRONE_COMMIT_MESSAGE}'
|
||||
- git push origin
|
||||
environment:
|
||||
GIT_PASSWORD:
|
||||
from_secret: GIT_PASSWORD
|
||||
GIT_USER:
|
||||
from_secret: GIT_USER
|
||||
volumes:
|
||||
- name: dockersock
|
||||
path: /var/run
|
||||
|
|
|
@ -7,9 +7,6 @@
|
|||
- Version: '1.00'
|
||||
- Area:
|
||||
- UniqueName: AREA1
|
||||
- EnumerationSet:
|
||||
- UniqueName: PHASE_FAILURES
|
||||
- Type: '0'
|
||||
- EnumerationSet:
|
||||
- UniqueName: YES_NO
|
||||
- Type: '1'
|
||||
|
@ -19,6 +16,9 @@
|
|||
- Member:
|
||||
- Name: NO
|
||||
- Ordinal: '0'
|
||||
- EnumerationSet:
|
||||
- UniqueName: PHASE_FAILURES
|
||||
- Type: '0'
|
||||
- EnumerationSet:
|
||||
- UniqueName: $TIMER_TYPE
|
||||
- Type: '1'
|
||||
|
@ -959,7 +959,6 @@
|
|||
- HyperlinkString: null
|
||||
- ERPAlias: null
|
||||
- ConfiguredUnitName: UNIT1
|
||||
- ConfiguredUnitName: UNIT2
|
||||
- Unit:
|
||||
- attributes:
|
||||
XPos: '101'
|
||||
|
@ -982,27 +981,6 @@
|
|||
- HyperlinkString: null
|
||||
- ERPAlias: null
|
||||
- ConfiguredEquipmentModuleName: PHASE11
|
||||
- Unit:
|
||||
- attributes:
|
||||
XPos: '245'
|
||||
YPos: '98'
|
||||
- UniqueName: UNIT2
|
||||
- Class: UNIT_CLS1
|
||||
- UniqueID: '4'
|
||||
- Logix5000UID: '0'
|
||||
- Server: null
|
||||
- MaxOwners: '1'
|
||||
- CrossInvocationString: null
|
||||
- CrossInvocationString: null
|
||||
- CrossInvocationString: null
|
||||
- CrossInvocationString: null
|
||||
- CrossInvocationString: null
|
||||
- HyperlinkString: null
|
||||
- HyperlinkString: null
|
||||
- HyperlinkString: null
|
||||
- HyperlinkString: null
|
||||
- HyperlinkString: null
|
||||
- ERPAlias: null
|
||||
- EquipmentModule:
|
||||
- attributes:
|
||||
XPos: '266'
|
||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue