diff --git a/.github/workflows/auto-pr-deploy-develop-to-master.yml b/.github/workflows/auto-pr-deploy-develop-to-master.yml index baf1396..9dbfb16 100644 --- a/.github/workflows/auto-pr-deploy-develop-to-master.yml +++ b/.github/workflows/auto-pr-deploy-develop-to-master.yml @@ -5,7 +5,8 @@ on: - develop jobs: - deploy-develop: + auto-pr-deploy-develop-to-master: + name: Create Deploy develop to master pull request runs-on: ubuntu-latest permissions: contents: write diff --git a/.github/workflows/auto-pr-merge-back-master-to-develop.yml b/.github/workflows/auto-pr-merge-back-master-to-develop.yml index f0b14f7..27cd295 100644 --- a/.github/workflows/auto-pr-merge-back-master-to-develop.yml +++ b/.github/workflows/auto-pr-merge-back-master-to-develop.yml @@ -5,7 +5,8 @@ on: - master jobs: - deploy-develop: + create-pr-merge-back-master-to-develop: + name: Create Merge back master to develop pull request runs-on: ubuntu-latest permissions: contents: write @@ -34,7 +35,6 @@ jobs: uses: peter-evans/create-pull-request@v7 with: branch: merge-back-master - draft: always-true title: Merge back master to develop - name: Enable Pull Request Automerge diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1eddac7..c275c6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,6 +35,8 @@ jobs: - name: Detect Changes id: changes uses: ./.github/actions/detect-changes + with: + ref_branch: ${{ env.MARKER_BRANCH }} - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3