Adjust naming

kyma-project · Feb 5, 2025 · e73fae7 · e73fae7
1 parent 921ad41
commit e73fae7
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/.github/actions/merge/action.yml b/.github/actions/merge/action.yml
@@ -1,5 +1,5 @@
 name: 'Merge'
-description: 'Action for merging to the main branch'
+description: 'Action for merging PR with the latest main branch'
 
 runs:
   using: 'composite'
@@ -25,7 +25,7 @@ runs:
         git switch --detach ${{ github.sha }}
       shell: bash
 
-    - name: Merge to main
+    - name: Merge with latest main
       run: |
         git merge main
       shell: bash

diff --git a/.github/workflows/pull-integration-cluster-k3d.yml b/.github/workflows/pull-integration-cluster-k3d.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Merge
+      - name: Merge with latest main
         uses: ./.github/actions/merge
       - name: Create Single Cluster
         uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0

diff --git a/.github/workflows/pull-integration-namespace-k3d.yml b/.github/workflows/pull-integration-namespace-k3d.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Merge
+      - name: Merge with latest main
         uses: ./.github/actions/merge
       - name: Create Single Cluster
         uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0

diff --git a/.github/workflows/pull-kyma-integration-tests.yml b/.github/workflows/pull-kyma-integration-tests.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Merge
+      - name: Merge with latest main
         uses: ./.github/actions/merge
       - name: Install k3d
         env:

diff --git a/.github/workflows/pull-lighthouse.yml b/.github/workflows/pull-lighthouse.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Merge
+      - name: Merge with latest main
         uses: ./.github/actions/merge
       - name: Create Single Cluster
         uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0

diff --git a/.github/workflows/pull-smoke-test-prod.yml b/.github/workflows/pull-smoke-test-prod.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Merge
+      - name: Merge with latest main
         uses: ./.github/actions/merge
       - name: Install k3d
         env:

diff --git a/.github/workflows/pull-smoke-test-stage.yml b/.github/workflows/pull-smoke-test-stage.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Merge
+      - name: Merge with latest main
         uses: ./.github/actions/merge
       - name: Install k3d
         env:

diff --git a/.github/workflows/pull-unit-tests.yml b/.github/workflows/pull-unit-tests.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Merge
+      - name: Merge with latest main
         uses: ./.github/actions/merge
       - uses: actions/setup-node@v4
         with: