batch-example/README.md

102 lines
1.8 KiB
Markdown
Raw Normal View History

2023-10-17 09:14:54 +00:00
# batch-example
2023-10-17 09:31:49 +00:00
This repository will store and allow versioning and approval of a batch configuration.
This repository **only** contains exported configuration. It does not contain any binary files (eg equipment-model.cfg nor system state or log files). These are excluded using the **.gitignore** file.
2023-10-17 09:14:54 +00:00
2023-10-17 17:26:08 +00:00
## change process
2023-10-17 19:33:14 +00:00
tea is here (i had to change docker file to just be based on node:latest)
https://gitea.com/gitea/tea/src/branch/main/docs/CLI.md
2023-10-18 13:14:53 +00:00
On ?tag ? push to master
clone master
branch deployed
yml -> xml
push deployed
2023-10-21 22:25:42 +00:00
pull to production PC and import.
2023-10-18 13:14:53 +00:00
pull to development, import, modify, export
push from development to format branch
2023-10-18 21:19:34 +00:00
on format-branch pull, xml -> yml, push to product-development and PR
2023-10-18 13:14:53 +00:00
2023-10-17 17:26:08 +00:00
### FTBatch development pc on development branch
```sh
2023-10-17 19:47:13 +00:00
?git branch -D format-branch
git checkout format-branch
git merge deployed
2023-10-17 17:26:08 +00:00
```
make changes and export files
commit and push back to server
```sh
git add -A
git commit
git push origin format-branch
```
### format-bot pc
```sh
git branch -D format-branch
git fetch origin
git checkout -b format-branch
git checkout master
git pull
git branch -D product-development
git checkout -b product-development
git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
```
run the formatter
```sh
git add -A
git commit
git push origin product-development
2023-10-17 17:27:31 +00:00
git push origin --delete format-branch
2023-10-17 17:26:08 +00:00
```
2023-10-17 19:33:14 +00:00
create a pull request
```sh
git fetch --tags
gotea pr c --base=master --head=product-development --repo another-user/batch-example --title="WIP: this is a PR! it rocks!"
```
closing a pull request (not used)
```sh
gotea pr close --repo another-user/batch-example 11
```
build
```sh
git checkout master
git pull
git checkout deployed
git merge master
```
make xml files
```sh
git add -A
git commit
git push origin deployed
```