From fa367d43d900ae0494315e1a31ad962406a29ecd Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 15:16:12 +0100 Subject: [PATCH] ..... --- .gitea/workflows/build->develop copy.-ml | 99 ++++++++++++++++++++++++ .gitea/workflows/build->develop.yml | 22 +----- .gitea/workflows/format->develop.yml | 81 ------------------- 3 files changed, 103 insertions(+), 99 deletions(-) create mode 100644 .gitea/workflows/build->develop copy.-ml delete mode 100644 .gitea/workflows/format->develop.yml diff --git a/.gitea/workflows/build->develop copy.-ml b/.gitea/workflows/build->develop copy.-ml new file mode 100644 index 0000000..b226caf --- /dev/null +++ b/.gitea/workflows/build->develop copy.-ml @@ -0,0 +1,99 @@ +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 + - env: env + run: printenv + - 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: config + run: | + git config --global user.name "${{ github.actor }}" + git config --global user.email "${{ github.event.pusher.email }}" + - name: commit + run: | + git add -A + git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" + - name: status + run: | + git branch -r + echo $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) + - 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 + git -C ../cloned fetch origin #--depth=1 + git -C ../cloned branch -r + git -C ../cloned checkout master || git -C ../cloned checkout -b master + 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 . + git status + 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 -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 }}) + " -t="WIP: ${{ github.event.head_commit.message }}" + fi + echo 'pushed new branch and created pr'; + else + if [[ $(git diff origin/${{ env.DEVELOPMENT_BRANCH }} | wc -c) -ne 0 ]]; then + git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned + git -C ../cloned fetch origin #--depth=1 + git -C ../cloned branch -r + git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH + 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 . + git status + git add -A + git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" + git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }}; + else + echo 'no changes so no push' + fi; + fi diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index b226caf..482b55d 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -42,25 +42,11 @@ jobs: echo $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) - name: push run: | + git add -A + git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " + if [[ $(git branch -r | grep -Fx " origin/${{ env.DEVELOPMENT_BRANCH }}" | wc -c) -eq 0 ]]; then - git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned - git -C ../cloned fetch origin #--depth=1 - git -C ../cloned branch -r - git -C ../cloned checkout master || git -C ../cloned checkout -b master - 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 . - git status - git checkout -b ${{ env.DEVELOPMENT_BRANCH }} - git add -A - git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }}" + git rebase origin/master 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; diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml deleted file mode 100644 index 53c2743..0000000 --- a/.gitea/workflows/format->develop.yml +++ /dev/null @@ -1,81 +0,0 @@ -name: convert-to-yml -run-name: ${{ github.actor }} is learning GitHub Actions -on: - push: - branches: - - 'format/**' -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' - - 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/format\//"$secondString"\/} - git status - - name: clone - run: | - git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned - git -C ../cloned fetch origin #--depth=1 - git -C ../cloned branch -r - git -C ../cloned checkout $DEVELOPMENT_BRANCH || git -C ../cloned checkout -b $DEVELOPMENT_BRANCH - 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 . - - 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 status - git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} " - git push 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 - # 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