From b6771ecb2e0fd07590a6332ddbeb25c5dfaf460b Mon Sep 17 00:00:00 2001 From: Continuous Integration Date: Sun, 22 Oct 2023 01:48:59 +0000 Subject: [PATCH] Continuous Integration Build Artifacts xml files converted to yml --- .gitea/workflows/bump-version.yml | 21 --------------------- .gitea/workflows/convert-to-yml.yml | 29 +++++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 .gitea/workflows/bump-version.yml diff --git a/.gitea/workflows/bump-version.yml b/.gitea/workflows/bump-version.yml deleted file mode 100644 index 196c3eb..0000000 --- a/.gitea/workflows/bump-version.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Bump version -on: - push: - branches: - - master -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: RouxAntoine/checkout@v3.5.4 - - name: Bump version and push tag - id: tag_version - uses: mathieudutour/github-tag-action@v6.1 - with: - github_token: ${{ secrets.TEA_TOKEN }} - - name: Create a GitHub release - uses: ncipollo/release-action@v1 - with: - tag: ${{ steps.tag_version.outputs.new_tag }} - name: Release ${{ steps.tag_version.outputs.new_tag }} - body: ${{ steps.tag_version.outputs.changelog }} \ No newline at end of file diff --git a/.gitea/workflows/convert-to-yml.yml b/.gitea/workflows/convert-to-yml.yml index 15a7fb5..eec024c 100644 --- a/.gitea/workflows/convert-to-yml.yml +++ b/.gitea/workflows/convert-to-yml.yml @@ -21,6 +21,27 @@ jobs: firstString=${{ github.ref_name }} secondString="develop-" echo ::set-env name=PRODUCTION_BRANCH::${firstString/format-/"$secondString"} + - 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 + ls + 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 @@ -28,15 +49,15 @@ jobs: run: | git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" - git config pull.rebase false git checkout -b ${{ env.PRODUCTION_BRANCH }} git add -A + git status git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml" git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }} - git fetch - git merge origin/master --allow-unrelated-histories --strategy-option=ours - git push origin HEAD:${{ env.PRODUCTION_BRANCH }} - name: make pull request + #git fetch + # git merge origin/master --allow-unrelated-histories --strategy-option=ours + # git push origin HEAD:${{ env.PRODUCTION_BRANCH }} run: | curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea chmod +x ./tea