From 4e577f97fac1e7837af821890e9a75a88170aaba Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 28 May 2021 15:22:07 +0100 Subject: [PATCH] Enable downward Sync from main (#60) We want to make sure anything on the main branch which is commited makes it's way down to the dev and other branches. --- .github/workflows/downstream.yml | 43 ++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 .github/workflows/downstream.yml diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml new file mode 100644 index 00000000..523e8143 --- /dev/null +++ b/.github/workflows/downstream.yml @@ -0,0 +1,43 @@ +# This is a basic workflow to help you get started with Actions + +name: Downstream Branch Updates + +on: + schedule: + - cron: '20 7 * * *' + # scheduled at 07:00 every Monday and Thursday + + workflow_dispatch: # click the button on Github repo! + + +jobs: + sync_with_upstream: + runs-on: ubuntu-latest + name: Sync main with upstream latest + + steps: + # Step 1: run a standard checkout action, provided by github + - name: Checkout main + uses: actions/checkout@v2 + with: + ref: main + # 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.1 + with: + upstream_repository: AtlasMediaGroup/TotalFreedomMod + upstream_branch: main + target_branch: main + git_pull_args: --ff-only # optional arg use, defaults to simple 'pull' + + # Step 3: Display a message if 'sync' step had new commits (simple test) + - name: Check for new commits + if: steps.sync.outputs.has_new_commits + run: echo "There were new commits." + + # Step 4: Print a helpful timestamp for your records (not required, just nice) + - name: Timestamp + run: date