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

Merge pull request 'llllllllllllll' (#131) from develop/tryagain into master 

Reviewed-on: #131
This commit is contained in:
giles 2023-10-23 02:04:25 +00:00
parent 14eae057d0 4cc3e0bc04
commit 1543d4fee5
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.gitea/workflows/build->develop.myml → .gitea/workflows/build->develop.---myml
View File

2
.gitea/workflows/develop -> build.yml
View File

@ -46,7 +46,7 @@ jobs:
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 }}
git merge --squash ${{ github.ref_name }} git merge --squash ${{ github.ref_name }}
git push origin HEAD:${{ env.BUILD_BRANCH }} git push -f origin HEAD:${{ env.BUILD_BRANCH }}
- name: make pull request comment - name: make pull request comment
run: | run: |

5
.gitea/workflows/format->develop.yml
View File

@ -25,9 +25,13 @@ jobs:
firstString=${{ github.ref_name }} firstString=${{ github.ref_name }}
secondString="develop" secondString="develop"
echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/} echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/}
git status
- name: clone - name: clone
run: | run: |
git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned
git -C ../cloned fetch origin #--depth=1
git -C ../cloned branch -r
git -C ../cloned switch $DEVELOPMENT_BRANCH
mv ../cloned/.git .. mv ../cloned/.git ..
rm -rf ../cloned rm -rf ../cloned
cp -r . ../cloned cp -r . ../cloned
@ -45,7 +49,6 @@ jobs:
run: | run: |
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
git config --global user.email "username@users.noreply.github.com" git config --global user.email "username@users.noreply.github.com"
git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
git add -A git add -A
git status git status
git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "

2
equipment-model.a.yml
View File

@ -135,7 +135,7 @@
- Required: '0' - Required: '0'
- ApproveSignatureTemplateName: null - ApproveSignatureTemplateName: null
- RevertSignatureTemplateName: null - RevertSignatureTemplateName: null
- Description: Confirmation by the author of the recipe that it is ready for redcdview.s...gfhhh.... - Description: Confirmation by the author of the recipe thatcdcscsvdsvdsvsdit is ready for redcdview.s...gfhhh....
- RecipeApprovalStep: - RecipeApprovalStep:
- Name: Review Recipe - Name: Review Recipe
- Id: '-3' - Id: '-3'

2
instructions/equipment-model2.a.yml
View File

@ -135,7 +135,7 @@
- Required: '0' - Required: '0'
- ApproveSignatureTemplateName: null - ApproveSignatureTemplateName: null
- RevertSignatureTemplateName: null - RevertSignatureTemplateName: null
- Description: Confirmation by the author of the recipe that it is ready forvfvfsxsxsxvf review.s...hhh.... - Description: Confirmation by the author of the recipe that it is ready forvfvfssssxsxsxvf review.s...hhh....
- RecipeApprovalStep: - RecipeApprovalStep:
- Name: Review Recipe - Name: Review Recipe
- Id: '-3' - Id: '-3'