From e73fae7fb9cc32409543262e4fb3af5ace3a94e2 Mon Sep 17 00:00:00 2001 From: akucharska Date: Wed, 5 Feb 2025 14:35:51 +0100 Subject: [PATCH] Adjust naming --- .github/actions/merge/action.yml | 4 ++-- .github/workflows/pull-integration-cluster-k3d.yml | 2 +- .github/workflows/pull-integration-namespace-k3d.yml | 2 +- .github/workflows/pull-kyma-integration-tests.yml | 2 +- .github/workflows/pull-lighthouse.yml | 2 +- .github/workflows/pull-smoke-test-prod.yml | 2 +- .github/workflows/pull-smoke-test-stage.yml | 2 +- .github/workflows/pull-unit-tests.yml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/actions/merge/action.yml b/.github/actions/merge/action.yml index 3fb643710d..ea3bc1773f 100644 --- 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 index 22ff4bfe1d..46990fb972 100644 --- 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 index 2862bf0182..7089475f0f 100644 --- 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 index a0031c3b0f..f73c3c36e4 100644 --- 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 index 4629747f83..395eb0ac79 100644 --- 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 index dad3aad9bc..98dca94a77 100644 --- 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 index fad0a9ff2b..2b076d9f3f 100644 --- 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 index f22d92ba91..67f5a933fb 100644 --- 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: