diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml new file mode 100644 index 0000000..452a013 --- /dev/null +++ b/.gitea/workflows/build->develop.yml @@ -0,0 +1,54 @@ +name: convert-to-yml +run-name: ${{ github.actor }} is learning GitHub Actions +on: + push: + branches: + - 'build-**' +jobs: + develop-branch: + runs-on: ubuntu-latest + steps: + # https://github.com/RouxAntoine/checkout/tree/v3.5.4 + - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 + with: + token: ${{ secrets.BOT_TOKEN }} + fetch-depth: '10' + - uses: http://sigyl.com:3000/actions/setup-node@v3 + with: + node-version: '20' + - run: git fetch + - name: log + run: git log -10 + - uses: http://sigyl.com:3000/actions/batch2yaml@master + with: + action: yml + path: '.' + - name: get development branch name + run: | + firstString=${{ github.ref_name }} + secondString="develop-" + echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build-/"$secondString"} + - name: GIT commit and push all changed files + env: + CI_COMMIT_MESSAGE: converted to yml for review. + CI_COMMIT_AUTHOR: Continuous Integration + 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 }} " + git checkout -b ${{ env.DEVELOPMENT_BRANCH }} + git merge --squash ${{ github.ref_name }} + git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} + - name: make pull request + #git fetch + # git merge origin/master --allow-unrelated-histories --strategy-option=ours + # git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} + 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 | 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 }}" + fi + rm ./tea diff --git a/.gitea/workflows/build-develop-branch.yml b/.gitea/workflows/develop -> build.yml similarity index 88% rename from .gitea/workflows/build-develop-branch.yml rename to .gitea/workflows/develop -> build.yml index 98515fc..bece6fa 100644 --- a/.gitea/workflows/build-develop-branch.yml +++ b/.gitea/workflows/develop -> build.yml @@ -12,6 +12,7 @@ jobs: - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 with: token: ${{ secrets.BOT_TOKEN }} + fetch-depth: '10' - uses: http://sigyl.com:3000/actions/setup-node@v3 with: node-version: '20' @@ -24,8 +25,11 @@ 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 }} + ./tea pr ls -f=base,head,index 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 + echo PR: $PR + - run: git fetch - name: get build branch name run: | firstString=${{ github.ref_name }} @@ -38,9 +42,10 @@ jobs: run: | git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" - git checkout -b ${{ env.BUILD_BRANCH }} git add -A - git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} yml files converted to xml" + git commit -a -m "${{ github.ref_name }} -> ${{ env.BUILD_BRANCH }} " + git checkout -b ${{ env.BUILD_BRANCH }} + git merge --squash ${{ github.ref_name }} git push origin HEAD:${{ env.BUILD_BRANCH }} - name: make pull request comment diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/format->develop.yml similarity index 96% rename from .gitea/workflows/convert-to-yml.yml rename to .gitea/workflows/format->develop.yml index cadfb8a..abba34f 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/format->develop.yml @@ -12,6 +12,7 @@ jobs: - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 with: token: ${{ secrets.BOT_TOKEN }} + fetch-depth: '10' - uses: http://sigyl.com:3000/actions/setup-node@v3 with: node-version: '20' @@ -47,7 +48,7 @@ jobs: git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git add -A git status - git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" + git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} #- name: push development # env: diff --git a/.gitea/workflows/convert-to-xml.yml b/.gitea/workflows/tag->deploy.yml similarity index 88% rename from .gitea/workflows/convert-to-xml.yml rename to .gitea/workflows/tag->deploy.yml index e83de5b..109b498 100644 --- a/.gitea/workflows/convert-to-xml.yml +++ b/.gitea/workflows/tag->deploy.yml @@ -11,6 +11,7 @@ jobs: - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 with: token: ${{ secrets.BOT_TOKEN }} + fetch-depth: '10' - name: ls run: ls - uses: actions/setup-node@v3 @@ -29,5 +30,5 @@ jobs: 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 "${{ env.CI_COMMIT_MESSAGE }} yml files converted to xml" + git commit -a -m ""${{ github.ref_name }} -> refs/heads/deployed-${{ github.ref_name }} "" git push origin HEAD:refs/heads/deployed-${{ github.ref_name }} diff --git a/instructions/equipment-model2.a.yml b/instructions/equipment-model2.a.yml index e6b4e98..56e685c 100644 --- a/instructions/equipment-model2.a.yml +++ b/instructions/equipment-model2.a.yml @@ -135,7 +135,7 @@ - Required: '0' - ApproveSignatureTemplateName: null - RevertSignatureTemplateName: null - - Description: Confirmation by the author of the recipe that it is ready for review.s...hhh.... + - Description: Confirmation by the author of the recipe that it is ready forvfvfsxsxsxvf review.s...hhh.... - RecipeApprovalStep: - Name: Review Recipe - Id: '-3' diff --git a/tea b/tea deleted file mode 100755 index 71f639b..0000000 Binary files a/tea and /dev/null differ