another-user
/
batch-example
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 143 Wiki Activity

...........
convert-to-yml / develop-branch (push) Successful in 32s Details

This commit is contained in:
giles 2023-10-23 01:19:50 +01:00
parent 83e4c7b03d
commit bb7316f93b
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitea/workflows/build->develop.yml
View File

@ -40,15 +40,3 @@ jobs:
git checkout -b ${{ env.DEVELOPMENT_BRANCH }} git checkout -b ${{ env.DEVELOPMENT_BRANCH }}
git merge --squash ${{ github.ref_name }} git merge --squash ${{ github.ref_name }}
git push origin HEAD:${{ env.DEVELOPMENT_BRANCH }} git push 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

2
.gitea/workflows/tag->deploy.yml
View File

@ -30,5 +30,5 @@ 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 add -A git add -A
git commit -a -m ""${{ github.ref_name }} -> refs/heads/deployed-${{ github.ref_name }} "" git commit -a -m "${{ github.ref_name }} -> refs/heads/deployed-${{ github.ref_name }} "
git push origin HEAD:refs/heads/deployed-${{ github.ref_name }} git push origin HEAD:refs/heads/deployed-${{ github.ref_name }}