Compare commits

...

5 Commits

Author SHA1 Message Date
giles 11647339af . 2023-10-18 22:19:26 +00:00
giles d6f99ccb1f .
continuous-integration/drone/push Build is passing Details
2023-10-18 22:19:17 +00:00
giles c3e6dc350a .
continuous-integration/drone/push Build is passing Details
2023-10-18 23:18:52 +01:00
giles f4e4081442 Merge pull request '.' (#50) from product-development into master
Reviewed-on: #50
2023-10-18 22:13:54 +00:00
giles e4fc805bbc Merge pull request '.' (#50) from product-development into master
continuous-integration/drone/push Build is passing Details
Reviewed-on: #50
2023-10-18 22:13:45 +00:00
5 changed files with 6 additions and 2214 deletions

View File

@ -17,12 +17,12 @@ 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 checkout -b master
- git pull origin master
#- git config credential.helper '!f() { sleep 1; echo "username=$${GIT_USER}"; echo "password=$${GIT_PASSWORD}"; }; f'
#- git checkout -b master
#- git pull origin master
# - git branch -D product-development
- git checkout -b product-development
- git merge --squash --no-commit --strategy-option=theirs format-branch
#- git merge --squash --no-commit --strategy-option=theirs format-branch
environment:
GIT_PASSWORD:
from_secret: GIT_PASSWORD

File diff suppressed because it is too large Load Diff

1
equipment-model.axml Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long