From 76840ec05f44096abc41666c3e99d89592fa708c Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Sun, 22 Oct 2023 02:19:14 +0000 Subject: [PATCH] Continuous Integration Build Artifacts xml files converted to yml --- .gitea/workflows/build-develop-branch.yml | 12 +- .gitea/workflows/convert-to-yml.yml | 2 +- README.md | 208 +++++++++++----------- 3 files changed, 116 insertions(+), 106 deletions(-) diff --git a/.gitea/workflows/build-develop-branch.yml b/.gitea/workflows/build-develop-branch.yml index 2a4be20..fb8018f 100644 --- a/.gitea/workflows/build-develop-branch.yml +++ b/.gitea/workflows/build-develop-branch.yml @@ -18,7 +18,17 @@ jobs: path: '.' - name: get PR number run: | - echo ::set-env name=PR||${./tea pr ls -f=base,head,index | grep "| master | firstString=${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1} + curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea + chmod +x ./tea + ./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.TEA_TOKEN }} + ./tea pr ls + ./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" + ./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' + ./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" + ./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | + ./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1 + echo ::set-env name=PR::${./tea pr ls -f=base,head,index | grep "| master | ${{ github.ref_name }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1} + rm ./tea - name: get build branch name run: | firstString=${{ github.ref_name }} diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index eec024c..aa45ed3 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -36,7 +36,6 @@ jobs: mv .git/config ../cloned/.git rm -r ./* rm -r .git - ls mv ../cloned/* . mv ../cloned/.git . @@ -65,3 +64,4 @@ jobs: if [[ $(./tea pr ls -f=base,head | grep "| master | ${{ env.PRODUCTION_BRANCH }} |" | head -c1 | wc -c) -eq 0 ]]; then ./tea pr c --base=master --head=${{ env.PRODUCTION_BRANCH }} --description="development pull request" -t="WIP: ${{ github.event.head_commit.message }}" fi + rm ./tea diff --git a/README.md b/README.md index 2a040a1..83b185d 100644 --- a/README.md +++ b/README.md @@ -1,104 +1,104 @@ -# batch-example - -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. - -## change process - -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 - - -On ?tag ? push to master -clone master -branch deployed -yml -> xml -push deployed - - - -pull to production PC and import. - -pull to development, import, modify, export -push from development to format branch - -on format-branch pull, xml -> yml, push to product-development and PR - - - - -### FTBatch development pc on development branch - -```sh -?git branch -D format-branch -git checkout format-branch -git merge deployed - -``` - -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 -git push origin --delete format-branch - -``` - -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 -``` +# batch-example + +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. + +## change process + +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 + + +On ?tag ? push to master +clone master +branch deployed +yml -> xml +push deployed + + + +pull to production PC and import. + +pull to development, import, modify, export +push from development to format branch + +on format-branch pull, xml -> yml, push to product-development and PR + + + + +### FTBatch development pc on development branch + +```sh +?git branch -D format-branch +git checkout format-branch +git merge deployed + +``` + +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 +git push origin --delete format-branch + +``` + +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 +```