From 2a0630ea8d8cab38c5251fe2e9884cecbfb51489 Mon Sep 17 00:00:00 2001 From: kyranjamie Date: Wed, 11 Oct 2023 16:30:04 +0200 Subject: [PATCH] ci: attempt automating merge back --- .github/workflows/create-version.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/create-version.yml b/.github/workflows/create-version.yml index 09898c6ce30..9e73f17dd29 100644 --- a/.github/workflows/create-version.yml +++ b/.github/workflows/create-version.yml @@ -66,3 +66,12 @@ jobs: with: name: release-notes path: release-notes.txt + + - name: Merge main -> dev + uses: devmasx/merge-branch@master + continue-on-error: true + with: + type: now + from_branch: main + target_branch: dev + github_token: ${{ secrets.SEMANTIC_RELEASE_TOKEN }}