Skip to content

Commit 2bd2f25

Browse files
committed
Merge branch 'neuronull/ci_add_merge_queue' into neuronull/ci_one_regression_workflow
2 parents 789e3e5 + 311de48 commit 2bd2f25

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

.github/workflows/k8s_e2e.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ jobs:
5757
CARGO_PROFILE_RELEASE_CODEGEN_UNITS: 256
5858
CARGO_INCREMENTAL: 0
5959
steps:
60-
<<<<<<< HEAD
6160
- name: Validate issue comment
6261
if: github.event_name == 'issue_comment'
6362
uses: tspascoal/get-user-teams-membership@v2
@@ -236,7 +235,7 @@ jobs:
236235
status: 'failure'
237236

238237
final-result:
239-
name: K8s E2E Test Suite
238+
name: K8s E2E Suite
240239
runs-on: ubuntu-latest
241240
needs: test-e2e-kubernetes
242241
if: |

0 commit comments

Comments
 (0)