Merge pull request '.' (#160) from develop/10007 into master
build-develop-branch / build-branch (push) Failing after 30s Details
build-develop-branch / delete (pull_request) Successful in 13s Details
build-develop-branch / if_merged (pull_request) Has been skipped Details

Reviewed-on: #160
This commit is contained in:
giles 2023-10-23 13:22:59 +00:00
commit ad343baf01
5 changed files with 43 additions and 39 deletions

View File

@ -17,8 +17,8 @@ jobs:
with: with:
node-version: '20' node-version: '20'
- run: git fetch - run: git fetch
- name: log - env: env
run: git log -10 run: printenv
- uses: http://sigyl.com:3000/actions/batch2yaml@master - uses: http://sigyl.com:3000/actions/batch2yaml@master
with: with:
action: yml action: yml
@ -28,26 +28,19 @@ jobs:
firstString=${{ github.ref_name }} firstString=${{ github.ref_name }}
secondString="develop" secondString="develop"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/} echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/}
- name: commit - name: config
env: run: |
CI_COMMIT_MESSAGE: converted to yml for review. git config --global user.name "${{ github.actor }}"
CI_COMMIT_AUTHOR: Continuous Integration git config --global user.email "${{ github.event.pusher.email }}"
- name: commit
run: | run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com"
git add -A git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
- name: status - name: status
env:
CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration
run: | run: |
git branch -r git branch -r
echo $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) echo $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c)
- name: diff - name: push
env:
CI_COMMIT_MESSAGE: converted to yml for review.
CI_COMMIT_AUTHOR: Continuous Integration
run: | run: |
if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
@ -68,14 +61,16 @@ jobs:
git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
git add -A git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}"
echo no development branch so pushing echo no development branch so pushing
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }};
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea; curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea;
chmod +x ./tea; chmod +x ./tea;
./tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }}; ./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" -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 fi
echo 'pushed new branch and created pr'; echo 'pushed new branch and created pr';
else else

View File

@ -13,6 +13,8 @@ jobs:
with: with:
token: ${{ secrets.BOT_TOKEN }} token: ${{ secrets.BOT_TOKEN }}
fetch-depth: '10' fetch-depth: '10'
- env: env
run: printenv
- uses: http://sigyl.com:3000/actions/setup-node@v3 - uses: http://sigyl.com:3000/actions/setup-node@v3
with: with:
node-version: '20' node-version: '20'
@ -20,28 +22,18 @@ jobs:
with: with:
action: xml action: xml
path: '.' 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 - 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 - name: get build branch name
run: | run: |
firstString=${{ github.ref_name }} firstString=${{ github.ref_name }}
secondString="build" secondString="build"
echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/} echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}
- name: GIT commit and push all changed files - name: push
env:
CI_COMMIT_MESSAGE: Development branch built to xml.
CI_COMMIT_AUTHOR: Continuous Integration
run: | run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com"
git add -A git add -A
git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} "
git checkout -b ${{ env.BUILD_BRANCH }} git checkout -b ${{ env.BUILD_BRANCH }}
@ -68,6 +60,25 @@ jobs:
else else
echo 'no changes so no push' echo 'no changes so no push'
fi; 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 - name: make pull request comment
run: | run: |
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea

View File

@ -4,6 +4,7 @@ on:
pull_request: pull_request:
types: types:
- closed - closed
- deleted
branches: branches:
- 'master' - 'master'

View File

@ -26,9 +26,6 @@ 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

View File

@ -12,7 +12,7 @@
- Type: '1' - Type: '1'
- Member: - Member:
- Name: YES - Name: YES
- Ordinal: '1' - Ordinal: '19'
- Member: - Member:
- Name: NO - Name: NO
- Ordinal: '0' - Ordinal: '0'
@ -124,7 +124,7 @@
- Name: Begin Approvals - Name: Begin Approvals
- Id: '-1' - Id: '-1'
- StepOrder: '1' - StepOrder: '1'
- Required: '1' - Required: 1q
- ApproveSignatureTemplateName: null - ApproveSignatureTemplateName: null
- RevertSignatureTemplateName: null - RevertSignatureTemplateName: null
- Description: Used to formally begin the approval process. - Description: Used to formally begin the approval process.
@ -137,7 +137,7 @@
- RevertSignatureTemplateName: null - RevertSignatureTemplateName: null
- Description: Confirmation by the author of the recipe thatcdcscsvdsvdsvsxsxsdit is ready for h v vredcdview.s...gfhhh.... - Description: Confirmation by the author of the recipe thatcdcscsvdsvdsvsxsxsdit is ready for h v vredcdview.s...gfhhh....
- RecipeApprovalStep: - RecipeApprovalStep:
- Name: Review Recipe - Name: Revi edcdw Recipe
- Id: '-3' - Id: '-3'
- StepOrder: '3' - StepOrder: '3'
- Required: '0' - Required: '0'