kkkkkkkkkkkk
This commit is contained in:
parent
be1c39dc42
commit
f7dbd429a5
|
@ -18,10 +18,17 @@ jobs:
|
||||||
path: '.'
|
path: '.'
|
||||||
- name: get production branch name
|
- name: get production branch name
|
||||||
run: |
|
run: |
|
||||||
pwd
|
|
||||||
firstString=${{ github.ref_name }}
|
firstString=${{ github.ref_name }}
|
||||||
secondString="develop-"
|
secondString="develop-"
|
||||||
echo ::set-env name=PRODUCTION_BRANCH::${firstString/format-/"$secondString"}
|
echo ::set-env name=PRODUCTION_BRANCH::${firstString/format-/"$secondString"}
|
||||||
|
- name: clone
|
||||||
|
run: |
|
||||||
|
git clone github.repositoryUrl ../cloned
|
||||||
|
mv ../cloned/.git ..
|
||||||
|
rm -rf ../cloned
|
||||||
|
cp -r . ../cloned
|
||||||
|
rm -rf ../cloned/.git
|
||||||
|
mv ../.git ../cloned
|
||||||
- name: GIT commit and push all changed files
|
- name: GIT commit and push all changed files
|
||||||
env:
|
env:
|
||||||
CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts
|
CI_COMMIT_MESSAGE: Continuous Integration Build Artifacts
|
||||||
|
@ -30,14 +37,14 @@ jobs:
|
||||||
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
|
git config --global user.name "${{ env.CI_COMMIT_AUTHOR }}"
|
||||||
git config --global user.email "username@users.noreply.github.com"
|
git config --global user.email "username@users.noreply.github.com"
|
||||||
git config pull.rebase false
|
git config pull.rebase false
|
||||||
git checkout -b ${{ env.PRODUCTION_BRANCH }}
|
git -C ../cloned checkout -b ${{ env.PRODUCTION_BRANCH }}
|
||||||
git add -A
|
git -C ../cloned add -A
|
||||||
git commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
|
git -C ../cloned commit -a -m "${{ env.CI_COMMIT_MESSAGE }} xml files converted to yml"
|
||||||
git push -f origin HEAD:${{ env.PRODUCTION_BRANCH }}
|
git -C ../cloned 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
|
- name: make pull request
|
||||||
|
#git fetch
|
||||||
|
# git merge origin/master --allow-unrelated-histories --strategy-option=ours
|
||||||
|
# git push origin HEAD:${{ env.PRODUCTION_BRANCH }}
|
||||||
run: |
|
run: |
|
||||||
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
|
curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output tea
|
||||||
chmod +x ./tea
|
chmod +x ./tea
|
||||||
|
|
Loading…
Reference in New Issue