another-user
/
batch-example
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 143 Wiki Activity

develop/tags-3 -> build/tags-3
convert-to-yml / develop-branch (push) Successful in 32s Details

This commit is contained in:
giles 2023-10-23 22:31:20 +00:00
parent 332970334f
commit b4bcd334ce
2 changed files with 104 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitea/workflows/pr-closed.yml → .gitea/workflows/develop-pr-closed.yml
View File

@ -6,23 +6,11 @@ on:
- closed - closed
- deleted - deleted
branches: branches:
- 'master' - master
jobs: jobs:
if_merged:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- name: delete develop branch
id: delete_develop_branch
run: git push origin --delete ${{ github.head_ref }}
continue-on-error: true
- uses: mainmatter/continue-on-error-comment@v1
with:
repo-token: ${{ secrets.BOT_TOKEN }}
outcome: ${{ steps.delete_develop_branch.outcome }}
test-id: Error code ${{ matrix.code }}
delete-develop: delete-develop:
if: ${{ ! startsWith(github.head_ref, 'develop/') }}
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: http://sigyl.com:3000/actions/checkout@v3.5.4 - uses: http://sigyl.com:3000/actions/checkout@v3.5.4
@ -42,4 +30,6 @@ jobs:
firstString=${{ github.head_ref }} firstString=${{ github.head_ref }}
secondString="build" secondString="build"
echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}s echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}s
- name: delete build branch
run: git push origin --delete ${{ env.BUILD_BRANCH }}

201
README.md
View File

@ -1,101 +1,100 @@
# batch-example # batch-example
This repository will store and allow versioning and approval of a batch configuration. 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. 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.
## change process ## change process
tea is here (i had to change docker file to just be based on node:latest) 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 https://gitea.com/gitea/tea/src/branch/main/docs/CLI.md
On ?tag ? push to master On ?tag ? push to master
clone master clone master
branch deployed branch deployed
yml -> xml yml -> xml
push deployed push deployed
pull to production PC and import
pull to production PC and import
pull to development, import, modify, export
pull to development, import, modify, export push from development to format branch
push from development to format branch
on format-branch pull, xml -> yml, push to product-development and PR
on format-branch pull, xml -> yml, push to product-development and PR
### FTBatch development pc on development branch
### FTBatch development pc on development branch
```sh
```sh ?git branch -D format-branch
?git branch -D format-branch git checkout format-branch
git checkout format-branch git merge deployed
git merge deployed
```
```
make changes and export files
make changes and export files
commit and push back to server
commit and push back to server
```sh
```sh git add -A
git add -A git commit
git commit git push origin format-branch
git push origin format-branch ```
```
### format-bot pc
### format-bot pc
```sh
```sh git branch -D format-branch
git branch -D format-branch git fetch origin
git fetch origin git checkout -b format-branch
git checkout -b format-branch git checkout master
git checkout master git pull
git pull git branch -D product-development
git branch -D product-development git checkout -b product-development
git checkout -b product-development git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
git merge --squash --no-commit --no-ff --strategyoption=theirs format-branch
```
```
run the formatter
run the formatter
```sh
```sh git add -A
git add -A git commit
git commit git push origin product-development
git push origin product-development git push origin --delete format-branch
git push origin --delete format-branch
```
```
create a pull request
create a pull request
```sh
```sh git fetch --tags
git fetch --tags gotea pr c --base=master --head=product-development --repo another-user/batch-example --title="WIP: this is a PR! it rocks!"
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)
closing a pull request (not used) ```sh
```sh gotea pr close --repo another-user/batch-example 11
gotea pr close --repo another-user/batch-example 11 ```
```
build
build
```sh
```sh
git checkout master
git checkout master git pull
git pull git checkout deployed
git checkout deployed git merge master
git merge master ```
```
make xml files
make xml files
```sh
```sh git add -A
git add -A git commit
git commit git push origin deployed
git push origin deployed ```
```