From 91080219f5fc1e63d67335fca588ef53021fb221 Mon Sep 17 00:00:00 2001 From: Typogalaxy <136544101+Typogalaxy@users.noreply.github.com> Date: Sun, 21 Jun 2026 11:59:44 +1000 Subject: [PATCH] ci: add fast-forward main workflow --- .github/workflows/fast-forward-main.yml | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/fast-forward-main.yml diff --git a/.github/workflows/fast-forward-main.yml b/.github/workflows/fast-forward-main.yml new file mode 100644 index 0000000..58a57e7 --- /dev/null +++ b/.github/workflows/fast-forward-main.yml @@ -0,0 +1,29 @@ +name: "Main: Fast-forward from dev" + +on: + workflow_dispatch: + +permissions: + contents: write + +concurrency: + group: fast-forward-main + cancel-in-progress: false + +jobs: + fast-forward: + runs-on: ubuntu-latest + + steps: + - name: Checkout main + uses: actions/checkout@v6 + with: + ref: main + fetch-depth: 0 + + - name: Fast-forward main to dev + run: | + git fetch origin main dev + git checkout main + git merge --ff-only origin/dev + git push origin main