From 1e87917b31c249809dd0c5cc354a0a94f5947887 Mon Sep 17 00:00:00 2001 From: vietchinh <1348151+vietchinh@users.noreply.github.com> Date: Tue, 7 Nov 2023 04:36:52 +0100 Subject: [PATCH 1/5] feat: testing repo sync --- .github/workflows/fork-sync.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 4c23251328..70dcef00ed 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -14,16 +14,15 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} BRANCH_NAME: ${{ github.ref_name }} - - name: git checkout - uses: actions/checkout@v4 - with: - ref: template - - name: Commit & Push changes to master - uses: benkaiser/rebase-commit-push@master - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - rebase: true - message: "chore: auto rebase ${date}" - branch: "master" - author_email: "1348151+vietchinh@users.noreply.github.com" - author_name: "vietchinh" \ No newline at end of file + - name: sync main + run: gh repo sync vietchinh/ulightblue -b main + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPOSITORY: ${{ github.repository }} + BRANCH_NAME: template + - name: sync live + run: gh repo sync vietchinh/ulightblue -b live + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPOSITORY: ${{ github.repository }} + BRANCH_NAME: template \ No newline at end of file From 8b1501101a550eaf4934c411e15c094c890a4ec1 Mon Sep 17 00:00:00 2001 From: vietchinh <1348151+vietchinh@users.noreply.github.com> Date: Tue, 7 Nov 2023 04:38:00 +0100 Subject: [PATCH 2/5] feat: testing repo sync2 --- .github/workflows/fork-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 70dcef00ed..7f13fdda37 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -13,7 +13,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} - BRANCH_NAME: ${{ github.ref_name }} + BRANCH_NAME: template - name: sync main run: gh repo sync vietchinh/ulightblue -b main env: From d5e3524f9702d7f05954068e0e596d6c92f15c4b Mon Sep 17 00:00:00 2001 From: vietchinh <1348151+vietchinh@users.noreply.github.com> Date: Tue, 7 Nov 2023 04:47:46 +0100 Subject: [PATCH 3/5] feat: testing repo sync --- .github/workflows/fork-sync.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index 7f13fdda37..e8f9ae7dcc 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -11,18 +11,18 @@ jobs: - name: sync template run: gh repo sync vietchinh/ulightblue -b template env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }} REPOSITORY: ${{ github.repository }} BRANCH_NAME: template - name: sync main run: gh repo sync vietchinh/ulightblue -b main env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }} REPOSITORY: ${{ github.repository }} BRANCH_NAME: template - name: sync live run: gh repo sync vietchinh/ulightblue -b live env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }} REPOSITORY: ${{ github.repository }} BRANCH_NAME: template \ No newline at end of file From 40d8e5e8e1cc6fdbb69766a81389a81dca3e6d89 Mon Sep 17 00:00:00 2001 From: vietchinh <1348151+vietchinh@users.noreply.github.com> Date: Tue, 7 Nov 2023 04:50:29 +0100 Subject: [PATCH 4/5] fix: renamed to master --- .github/workflows/fork-sync.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index e8f9ae7dcc..ade01db012 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -15,7 +15,7 @@ jobs: REPOSITORY: ${{ github.repository }} BRANCH_NAME: template - name: sync main - run: gh repo sync vietchinh/ulightblue -b main + run: gh repo sync vietchinh/ulightblue -b master env: GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }} REPOSITORY: ${{ github.repository }} From 389b3716a844c6e8507c0453d081e35b4d680dde Mon Sep 17 00:00:00 2001 From: vietchinh <1348151+vietchinh@users.noreply.github.com> Date: Tue, 7 Nov 2023 04:58:27 +0100 Subject: [PATCH 5/5] chore: use github token --- .github/workflows/fork-sync.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/fork-sync.yml b/.github/workflows/fork-sync.yml index ade01db012..610b10f393 100644 --- a/.github/workflows/fork-sync.yml +++ b/.github/workflows/fork-sync.yml @@ -11,18 +11,18 @@ jobs: - name: sync template run: gh repo sync vietchinh/ulightblue -b template env: - GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} BRANCH_NAME: template - name: sync main run: gh repo sync vietchinh/ulightblue -b master env: - GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} BRANCH_NAME: template - name: sync live run: gh repo sync vietchinh/ulightblue -b live env: - GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY: ${{ github.repository }} BRANCH_NAME: template \ No newline at end of file