Merge pull request #42 from tangram-orchestre/merge-back-master

Merge back master to develop
tangram-orchestre · Feb 16, 2025 · 7ef2b2b · 7ef2b2b
2 parents c8a28df + 3fbd549
commit 7ef2b2b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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