From 3d697ac401a30c78dfbd9608ad49dbcea116b559 Mon Sep 17 00:00:00 2001 From: Cedrik Hoffmann Date: Mon, 27 May 2024 01:17:26 +0200 Subject: [PATCH] fix: fix workflow on publish release --- .github/workflows/build-and-push-production.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-push-production.yml b/.github/workflows/build-and-push-production.yml index 976450b..3ffeab7 100644 --- a/.github/workflows/build-and-push-production.yml +++ b/.github/workflows/build-and-push-production.yml @@ -45,17 +45,17 @@ jobs: draft: false prerelease: false - - name: Merge main into dev branch + - name: Merge main into develop branch uses: thomaseizinger/create-pull-request@1.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: head: main - base: dev - title: Merge main into dev branch + base: develop + title: Merge main into develop branch body: | - This PR merges the main branch back into dev. - This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the dev branch. + This PR merges the main branch back into develop. + This happens to ensure that the updates that happend on the release branch, i.e. CHANGELOG and manifest updates are also present on the develop branch. - name: Checkout code uses: actions/checkout@v4