diff --git a/.gitea/workflows/build-develop-branch.yml b/.gitea/workflows/build-develop-branch.yml index 2175e8e..3af8ed6 100644 --- a/.gitea/workflows/build-develop-branch.yml +++ b/.gitea/workflows/build-develop-branch.yml @@ -21,12 +21,6 @@ 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.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 diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index a079dcc..cda9c75 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -21,20 +21,52 @@ jobs: firstString=${{ github.ref_name }} secondString="develop-" echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format-/"$secondString"} - - name: push development + - name: clone + run: | + git remote -v + git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned + git -C ../cloned remote -v + + git -C ../cloned status + mv ../cloned/.git .. + rm -rf ../cloned + cp -r . ../cloned + rm -rf ../cloned/.git + mv ../.git ../cloned + mv .git/config ../cloned/.git + rm -r ./* + rm -r .git + mv ../cloned/* . + mv ../cloned/.git . + + ls -la + git status + - name: GIT commit and push all changed files env: CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts 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 fetch --depth=1 + git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git add -A - git commit -m "${{ env.CI_COMMIT_MESSAGE }} - - converted from batch" - git merge origin/master --strategy-option=ours --allow-unrelated + git status + git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} + #- name: push development + # env: + # CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts + # 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 fetch --depth=1 + # git add -A + # git commit -m "${{ env.CI_COMMIT_MESSAGE }} + # + # converted from batch" + # git merge origin/master --strategy-option=ours --allow-unrelated + # git push -f origin HEAD:${{ env.DEVELOPMENT_BRANCH }} - name: make pull request #git fetch # git merge origin/master --allow-unrelated-histories --strategy-option=ours @@ -56,12 +88,6 @@ jobs: run: | curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea chmod +x ./tea - ./tea pr ls -f=base,head,index - ./tea pr ls -f=base,head,index | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" - ./tea pr ls -f=base,head,index | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | tr -d ' ' - ./tea pr ls -f=base,head,index | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | tr -d ' ' | tr "|" "\n" - ./tea pr ls -f=base,head,index | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | - ./tea pr ls -f=base,head,index | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1 echo ::set-env name=PR::$(./tea pr ls -f=base,head,index | grep "| master | ${{ env.DEVELOPMENT_BRANCH }} |" | tr -d ' ' | tr "|" "\n" | head -n 4 | tail -1) echo $PR rm ./tea