From dcd97f0d1e46f36694a31d2c2dba2e34c404ee02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Darveau?= Date: Mon, 28 Jun 2021 18:11:16 -0400 Subject: [PATCH] test another fork syncing action --- .github/workflows/merge-upstream-master.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge-upstream-master.yml b/.github/workflows/merge-upstream-master.yml index 639a34a..48610d0 100644 --- a/.github/workflows/merge-upstream-master.yml +++ b/.github/workflows/merge-upstream-master.yml @@ -21,9 +21,9 @@ jobs: # submodules: 'recursive' ### may be needed in your situation # Step 2: run this sync action - specify the upstream repo, upstream branch to sync with, and target sync branch - - name: Pull (Fast-Forward) upstream changes - id: sync - uses: aormsby/Fork-Sync-With-Upstream-action@v2.3 + - name: Sync-Fork-action + uses: XueMoMo/Sync-Fork-action@v1.0.6 + #uses: XueMoMo/Fork-Sync-With-Upstream-action@v2.3 with: upstream_repository: pawelmalak/flame upstream_branch: master