From 619467527ab0c9ed3cc15776f7b2a5c59b777797 Mon Sep 17 00:00:00 2001 From: giles Date: Mon, 23 Oct 2023 02:35:31 +0100 Subject: [PATCH] llllllllllllll --- ...d->develop.myml => build->develop.---myml} | 0 .gitea/workflows/format->develop.yml | 30 +++++++++++-------- 2 files changed, 17 insertions(+), 13 deletions(-) rename .gitea/workflows/{build->develop.myml => build->develop.---myml} (100%) diff --git a/.gitea/workflows/build->develop.myml b/.gitea/workflows/build->develop.---myml similarity index 100% rename from .gitea/workflows/build->develop.myml rename to .gitea/workflows/build->develop.---myml diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index e874e0e..cd87b00 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -25,27 +25,31 @@ jobs: firstString=${{ github.ref_name }} secondString="develop" echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/} - - name: clone - run: | - git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned - 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: clone + # run: | + # git clone ${{ github.serverUrl }}/${{ github.repository }} ../cloned + # 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 add -A + git stash git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}" git config --global user.email "username@users.noreply.github.com" + git checkout master git checkout -b ${{ env.DEVELOPMENT_BRANCH }} + git stash pop git add -A git status git commit -a -m "${{ github.ref_name }} -> ${{ env.DEVELOPMENT_BRANCH }} "