From 9a31c920d4046c8f5c138c4e799a815b7fed2ed9 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 7 Jan 2022 11:03:46 +0800 Subject: [PATCH 1/6] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c7738b502..7b0a5cd1a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -134,7 +134,7 @@ jobs: git checkout -b test git add *.apk git commit -m "${{ needs.prepare.outputs.versionL }}" - git remote add origin "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.actor }}/release" + git remote add origin "https://${{ github.actor }}:${{ secrets.ACTIONS_TOKEN }}@github.com/${{ github.actor }}/release" git push -f -u origin test telegram: From 70786c31e890afd6686174ac0cc21e8f33f9e580 Mon Sep 17 00:00:00 2001 From: celetor Date: Fri, 7 Jan 2022 11:08:18 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 6 +++--- .github/workflows/test.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7ba1b54ce..59e8506ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,14 +82,14 @@ jobs: - name: Push Assets To "release" Branch if: ${{ github.actor == 'gedoor' }} run: | - cd $GITHUB_WORKSPACE/apk || exit 1 git init git config --local user.name "github-actions[bot]" git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git checkout -b release + git clone "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.actor }}/release" -b release release-branch + mv -rf $GITHUB_WORKSPACE/apk/*.apk release-branch + cd release-branch git add *.apk 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 - name: Purge Jsdelivr Cache if: ${{ github.actor == 'gedoor' }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c7738b502..e94239772 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -127,14 +127,14 @@ jobs: run: mv */*.apk . ;rm -rf */ - name: Push To "test" Branch run: | - cd $GITHUB_WORKSPACE/apk git init git config --local user.name "github-actions[bot]" git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git checkout -b test + git clone "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.actor }}/release" -b test test-branch + mv -rf $GITHUB_WORKSPACE/apk/*.apk test-branch + cd test-branch git add *.apk 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 telegram: From 0c98a9e10a2744159cfb842d69920b852b3f133f Mon Sep 17 00:00:00 2001 From: celetor Date: Fri, 7 Jan 2022 11:20:02 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59e8506ba..75b53fc67 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -85,7 +85,7 @@ jobs: git init git config --local user.name "github-actions[bot]" git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git clone "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.actor }}/release" -b release release-branch + git clone "https://${{ github.actor }}:${{ secrets.ACTIONS_TOKEN }}@github.com/${{ github.actor }}/release" -b release release-branch mv -rf $GITHUB_WORKSPACE/apk/*.apk release-branch cd release-branch git add *.apk diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e94239772..81bbdcd56 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -130,7 +130,7 @@ jobs: git init git config --local user.name "github-actions[bot]" git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git clone "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.actor }}/release" -b test test-branch + git clone "https://${{ github.actor }}:${{ secrets.ACTIONS_TOKEN }}@github.com/${{ github.actor }}/release" -b test test-branch mv -rf $GITHUB_WORKSPACE/apk/*.apk test-branch cd test-branch git add *.apk From a52663049bd72a3a5c7413cbb9925399ea91e59b Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 7 Jan 2022 11:20:33 +0800 Subject: [PATCH 4/6] Update test.yml --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e94239772..81bbdcd56 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -130,7 +130,7 @@ jobs: git init git config --local user.name "github-actions[bot]" git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" - git clone "https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.actor }}/release" -b test test-branch + git clone "https://${{ github.actor }}:${{ secrets.ACTIONS_TOKEN }}@github.com/${{ github.actor }}/release" -b test test-branch mv -rf $GITHUB_WORKSPACE/apk/*.apk test-branch cd test-branch git add *.apk From d19390fc50e67eb6003ed44d9b00dfc383e90291 Mon Sep 17 00:00:00 2001 From: celetor Date: Fri, 7 Jan 2022 11:39:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 75b53fc67..b4a27d9ed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -86,7 +86,7 @@ jobs: git config --local user.name "github-actions[bot]" git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git clone "https://${{ github.actor }}:${{ secrets.ACTIONS_TOKEN }}@github.com/${{ github.actor }}/release" -b release release-branch - mv -rf $GITHUB_WORKSPACE/apk/*.apk release-branch + mv -f $GITHUB_WORKSPACE/apk/*.apk release-branch cd release-branch git add *.apk git commit -m "${{ env.RELEASE_VERSION }}" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 81bbdcd56..51631e482 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -131,7 +131,7 @@ jobs: git config --local user.name "github-actions[bot]" git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" git clone "https://${{ github.actor }}:${{ secrets.ACTIONS_TOKEN }}@github.com/${{ github.actor }}/release" -b test test-branch - mv -rf $GITHUB_WORKSPACE/apk/*.apk test-branch + mv -f $GITHUB_WORKSPACE/apk/*.apk test-branch cd test-branch git add *.apk git commit -m "${{ needs.prepare.outputs.versionL }}" From 7b790582c6c387058b709a362a0ca2aa241399c2 Mon Sep 17 00:00:00 2001 From: celetor Date: Fri, 7 Jan 2022 11:54:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 5 ++--- .github/workflows/test.yml | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b4a27d9ed..588a84a8e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -82,9 +82,8 @@ jobs: - name: Push Assets To "release" Branch if: ${{ github.actor == 'gedoor' }} run: | - git init - git config --local user.name "github-actions[bot]" - git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git clone "https://${{ github.actor }}:${{ secrets.ACTIONS_TOKEN }}@github.com/${{ github.actor }}/release" -b release release-branch mv -f $GITHUB_WORKSPACE/apk/*.apk release-branch cd release-branch diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 51631e482..1b4d1cf60 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -127,9 +127,8 @@ jobs: run: mv */*.apk . ;rm -rf */ - name: Push To "test" Branch run: | - git init - git config --local user.name "github-actions[bot]" - git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com" + git config --global user.name "github-actions[bot]" + git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com" git clone "https://${{ github.actor }}:${{ secrets.ACTIONS_TOKEN }}@github.com/${{ github.actor }}/release" -b test test-branch mv -f $GITHUB_WORKSPACE/apk/*.apk test-branch cd test-branch