From 7f0eeab09cb38778abecddd03ab8a42d2cdaf737 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 28 Oct 2022 13:25:59 +0100 Subject: [PATCH] Remove Broken Downstream Merge Action (#281) This never worked, let's just remove it. --- .github/workflows/downstream.yml | 43 -------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 .github/workflows/downstream.yml diff --git a/.github/workflows/downstream.yml b/.github/workflows/downstream.yml deleted file mode 100644 index 93fed296..00000000 --- a/.github/workflows/downstream.yml +++ /dev/null @@ -1,43 +0,0 @@ -# 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 current development branch - uses: actions/checkout@v2 - with: - ref: development - # 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@v3.3 - with: - upstream_repository: AtlasMediaGroup/TotalFreedomMod - upstream_branch: main - target_branch: development - 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