From 5a1a45746efc8abe49e9a4598125e17bb1b0e5a6 Mon Sep 17 00:00:00 2001 From: giles Date: Mon, 23 Oct 2023 13:11:04 +0000 Subject: [PATCH 1/3] build/10006 -> develop/10006 --- .gitea/workflows/build->develop.yml | 29 +++++++++++---------------- .gitea/workflows/develop -> build.yml | 13 ++++++------ .gitea/workflows/pr-closed.yml | 1 + README.md | 3 --- equipment-model.a.yml | 4 ++-- 5 files changed, 22 insertions(+), 28 deletions(-) diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 47e9d07..c3df6a9 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -17,8 +17,8 @@ jobs: with: node-version: '20' - run: git fetch - - name: log - run: git log -10 + - env: env + run: printenv - uses: http://sigyl.com:3000/actions/batch2yaml@master with: action: yml @@ -28,26 +28,19 @@ jobs: firstString=${{ github.ref_name }} secondString="develop" echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/} - - name: commit - env: - CI_COMMIT_MESSAGE: converted to yml for review. - CI_COMMIT_AUTHOR: Continuous Integration + - name: config + run: | + git config --global user.name "${{ github.actor }}" + git config --global user.email "${{ github.event.pusher.email }}" + - name: commit run: | - git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - git config --global user.email "username@users.noreply.github.com" git add -A git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" - name: status - env: - CI_COMMIT_MESSAGE: converted to yml for review. - CI_COMMIT_AUTHOR: Continuous Integration run: | git branch -r echo $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) - - name: diff - env: - CI_COMMIT_MESSAGE: converted to yml for review. - CI_COMMIT_AUTHOR: Continuous Integration + - name: push run: | if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned @@ -68,14 +61,16 @@ jobs: git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git add -A git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" - echo no development branch so pushing git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; 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.BOT_TOKEN }}; if [[ $(./tea pr ls -f=base,head | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | head -c1 | wc -c) -eq 0 ]]; then - ./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description="development pull request" -t="WIP: ${{ github.event.head_commit.message }}" + ./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description=" + development pull request + this PR is instigated by and will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }}) + " -t="WIP: ${{ github.event.head_commit.message }}" fi echo 'pushed new branch and created pr'; else diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 8532d64..39b38eb 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -13,6 +13,8 @@ jobs: with: token: ${{ secrets.BOT_TOKEN }} fetch-depth: '10' + - env: env + run: printenv - uses: http://sigyl.com:3000/actions/setup-node@v3 with: node-version: '20' @@ -30,18 +32,17 @@ jobs: echo ::set-env name=PR::$PR rm ./tea - run: git fetch + - name: config + run: | + git config --global user.name "${{ github.actor }}" + git config --global user.email "${{ github.event.pusher.email }}" - name: get build branch name run: | firstString=${{ github.ref_name }} secondString="build" echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/} - - name: GIT commit and push all changed files - env: - CI_COMMIT_MESSAGE: Development branch built to xml. - CI_COMMIT_AUTHOR: Continuous Integration + - name: push run: | - git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" - git config --global user.email "username@users.noreply.github.com" git add -A git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " git checkout -b ${{ env.BUILD_BRANCH }} diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index ba3f6fc..0f10aa6 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -4,6 +4,7 @@ on: pull_request: types: - closed + - deleted branches: - 'master' diff --git a/README.md b/README.md index 2a040a1..c8370f3 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,6 @@ 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 diff --git a/equipment-model.a.yml b/equipment-model.a.yml index 72f103f..1733b99 100644 --- a/equipment-model.a.yml +++ b/equipment-model.a.yml @@ -124,7 +124,7 @@ - Name: Begin Approvals - Id: '-1' - StepOrder: '1' - - Required: '1' + - Required: 1q - ApproveSignatureTemplateName: null - RevertSignatureTemplateName: null - Description: Used to formally begin the approval process. @@ -137,7 +137,7 @@ - RevertSignatureTemplateName: null - Description: Confirmation by the author of the recipe thatcdcscsvdsvdsvsxsxsdit is ready for h v vredcdview.s...gfhhh.... - RecipeApprovalStep: - - Name: Review Recipe + - Name: Revi edcdw Recipe - Id: '-3' - StepOrder: '3' - Required: '0' From 23440b062a806f42299432701dcecad93a30888d Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 14:14:29 +0100 Subject: [PATCH 2/3] jfdjfjf --- equipment-model.a.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/equipment-model.a.yml b/equipment-model.a.yml index 1733b99..751722e 100644 --- a/equipment-model.a.yml +++ b/equipment-model.a.yml @@ -12,7 +12,7 @@ - Type: '1' - Member: - Name: YES - - Ordinal: '1' + - Ordinal: '19' - Member: - Name: NO - Ordinal: '0' From 8c0f4838a96fc9c653c3ef0adcd483ed9c932ba8 Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 14:21:34 +0100 Subject: [PATCH 3/3] . --- .gitea/workflows/build->develop.yml | 2 +- .gitea/workflows/develop -> build.yml | 28 ++++++++++++++++++--------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index c3df6a9..b226caf 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -66,7 +66,7 @@ jobs: 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.BOT_TOKEN }}; - if [[ $(./tea pr ls -f=base,head | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | head -c1 | wc -c) -eq 0 ]]; then + if [[ $(./tea pr ls -f=base,head -o=csv | grep grep "\"master\",\"${{ env.DEVELOPMENT_BRANCH }}\"" | head -c1 | wc -c) -eq 0 ]]; then ./tea pr c --base=master --head=${{ env.DEVELOPMENT_BRANCH }} --description=" development pull request this PR is instigated by and will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }}) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 39b38eb..076b011 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -22,15 +22,6 @@ jobs: with: action: xml path: '.' - - name: get PR number - run: | - 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.BOT_TOKEN }} - pr=$(./tea pr ls -f=base,head,index -o csv | grep "\"master\",\"${{ github.ref_name }}\"" | tr -d ' ' | tr "," "\n" | head -n 4 | tail -1) - export PR="${pr//[\"\'\`]/}" - echo ::set-env name=PR::$PR - rm ./tea - run: git fetch - name: config run: | @@ -69,6 +60,25 @@ jobs: else echo 'no changes so no push' fi; + - name: make PR + run: | + 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.BOT_TOKEN }} + if [[ $(./tea pr ls -f=base,head -o=csv | grep grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then + ./tea pr c --base=master --head=${{ github.ref_name }} --description=" + development pull request + this PR is will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }}) + " -t="WIP: ${{ github.event.head_commit.message }}" + fi + - name: get PR number + run: | + curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea + chmod +x ./tea + pr=$(./tea pr ls -f=base,head,index -o csv | grep "\"master\",\"${{ github.ref_name }}\"" | tr -d ' ' | tr "," "\n" | head -n 4 | tail -1) + export PR="${pr//[\"\'\`]/}" + echo ::set-env name=PR::$PR + rm ./tea - name: make pull request comment run: | curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea