Skip to content

Commit e73fae7

Browse files
committed
Adjust naming
1 parent 921ad41 commit e73fae7

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

.github/actions/merge/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: 'Merge'
2-
description: 'Action for merging to the main branch'
2+
description: 'Action for merging PR with the latest main branch'
33

44
runs:
55
using: 'composite'
@@ -25,7 +25,7 @@ runs:
2525
git switch --detach ${{ github.sha }}
2626
shell: bash
2727

28-
- name: Merge to main
28+
- name: Merge with latest main
2929
run: |
3030
git merge main
3131
shell: bash

.github/workflows/pull-integration-cluster-k3d.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
25-
- name: Merge
25+
- name: Merge with latest main
2626
uses: ./.github/actions/merge
2727
- name: Create Single Cluster
2828
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0

.github/workflows/pull-integration-namespace-k3d.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@v4
2323
with:
2424
fetch-depth: 0
25-
- name: Merge
25+
- name: Merge with latest main
2626
uses: ./.github/actions/merge
2727
- name: Create Single Cluster
2828
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0

.github/workflows/pull-kyma-integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v4
2424
with:
2525
fetch-depth: 0
26-
- name: Merge
26+
- name: Merge with latest main
2727
uses: ./.github/actions/merge
2828
- name: Install k3d
2929
env:

.github/workflows/pull-lighthouse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@v4
2222
with:
2323
fetch-depth: 0
24-
- name: Merge
24+
- name: Merge with latest main
2525
uses: ./.github/actions/merge
2626
- name: Create Single Cluster
2727
uses: AbsaOSS/k3d-action@4e8b3239042be1dc0aed6c5eb80c13b18200fc79 #v2.4.0

.github/workflows/pull-smoke-test-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v4
2424
with:
2525
fetch-depth: 0
26-
- name: Merge
26+
- name: Merge with latest main
2727
uses: ./.github/actions/merge
2828
- name: Install k3d
2929
env:

.github/workflows/pull-smoke-test-stage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v4
2424
with:
2525
fetch-depth: 0
26-
- name: Merge
26+
- name: Merge with latest main
2727
uses: ./.github/actions/merge
2828
- name: Install k3d
2929
env:

.github/workflows/pull-unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v4
2424
with:
2525
fetch-depth: 0
26-
- name: Merge
26+
- name: Merge with latest main
2727
uses: ./.github/actions/merge
2828
- uses: actions/setup-node@v4
2929
with:

0 commit comments

Comments
 (0)