Merge remote-tracking branch 'origin/master'

This commit is contained in:
gedoor 2022-01-07 13:35:29 +08:00
commit 860cd198b9
2 changed files with 10 additions and 12 deletions

View File

@ -82,14 +82,13 @@ jobs:
- name: Push Assets To "release" Branch - name: Push Assets To "release" Branch
if: ${{ github.actor == 'gedoor' }} if: ${{ github.actor == 'gedoor' }}
run: | run: |
cd $GITHUB_WORKSPACE/apk || exit 1 git config --global user.name "github-actions[bot]"
git init git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]" git clone "https://${{ github.actor }}:${{ secrets.ACTIONS_TOKEN }}@github.com/${{ github.actor }}/release" -b release release-branch
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" mv -f $GITHUB_WORKSPACE/apk/*.apk release-branch
git checkout -b release cd release-branch
git add *.apk git add *.apk
git commit -m "${{ env.RELEASE_VERSION }}" git commit -m "${{ env.RELEASE_VERSION }}"
git remote add origin "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.actor }}/release"
git push -f -u origin release git push -f -u origin release
- name: Purge Jsdelivr Cache - name: Purge Jsdelivr Cache
if: ${{ github.actor == 'gedoor' }} if: ${{ github.actor == 'gedoor' }}

View File

@ -127,14 +127,13 @@ jobs:
run: mv */*.apk . ;rm -rf */ run: mv */*.apk . ;rm -rf */
- name: Push To "test" Branch - name: Push To "test" Branch
run: | run: |
cd $GITHUB_WORKSPACE/apk git config --global user.name "github-actions[bot]"
git init git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]" git clone "https://${{ github.actor }}:${{ secrets.ACTIONS_TOKEN }}@github.com/${{ github.actor }}/release" -b test test-branch
git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" mv -f $GITHUB_WORKSPACE/apk/*.apk test-branch
git checkout -b test cd test-branch
git add *.apk git add *.apk
git commit -m "${{ needs.prepare.outputs.versionL }}" git commit -m "${{ needs.prepare.outputs.versionL }}"
git remote add origin "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.actor }}/release"
git push -f -u origin test git push -f -u origin test
telegram: telegram: