From 757cf72365f309897576201710a599fe0fd2bfe8 Mon Sep 17 00:00:00 2001 From: suchitra Date: Wed, 15 Nov 2023 09:37:50 +0000 Subject: [PATCH 1/2] fixes for syncing translated repos from main --- .github/workflows/sync.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index e2c3a39a2..3db15ad3e 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -11,12 +11,12 @@ jobs: runs-on: ubuntu-latest name: Sync latest commits from upstream repo steps: - # - name: Checkout target repo - # uses: actions/checkout@v2 - # with: - # ref: main - # token: ${{ secrets.GH_TOKEN }} - # persist-credentials: false + - name: Checkout target repo + uses: actions/checkout@v2 + with: + ref: main + token: ${{ secrets.GH_TOKEN }} + persist-credentials: false - name: repo-sync-develop uses: repo-sync/github-sync@v2 with: From 3ee68caebfafb7649e33ddd58cd6f59da26cfbe9 Mon Sep 17 00:00:00 2001 From: suchitra Date: Wed, 15 Nov 2023 09:38:32 +0000 Subject: [PATCH 2/2] fixes for syncing translated repos from main --- .github/workflows/sync.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml index 3db15ad3e..70f8403be 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml @@ -25,12 +25,12 @@ jobs: destination_branch: "develop" github_token: ${{ secrets.GH_TOKEN }} sync_tags: "true" - # - name: repo-sync-lts-2022-r1 - # uses: repo-sync/github-sync@v2 - # with: - # source_repo: "https://${{ secrets.GH_TOKEN }}@github.com//YoYoGames/GameMaker-Manual.git" - # source_branch: "lts-2022-r1" - # destination_branch: "lts-2022-r1" - # github_token: ${{ secrets.GH_TOKEN }} - # sync_tags: "true" + - name: repo-sync-lts-2022-r1 + uses: repo-sync/github-sync@v2 + with: + source_repo: "https://${{ secrets.GH_TOKEN }}@github.com//YoYoGames/GameMaker-Manual.git" + source_branch: "lts-2022-r1" + destination_branch: "lts-2022-r1" + github_token: ${{ secrets.GH_TOKEN }} + sync_tags: "true"