Skip to content

Commit 8b47b5a

Browse files
authored
Merge branch 'release-3.5' into cr-24608-sync-upstream-3.5.6
2 parents 5550300 + c9c8c9d commit 8b47b5a

File tree

55 files changed

+58995
-1108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+58995
-1108
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ contact_links:
44
- name: Have you read the docs?
55
url: https://argo-workflows.readthedocs.io/en/latest
66
about: Much help can be found in the docs
7-
- name: Ask a question
8-
url: https://github.com/argoproj/argo-workflows/discussions/new
7+
- name: Ask a question about Codefresh's Argo Worklfows
8+
url: https://github.com/codefresh-io/argo-workflows/discussions/new
99
about: Ask a question or start a discussion about workflows
1010
- name: Chat on Slack
1111
url: https://argoproj.github.io/community/join-slack

.github/workflows/ci-build.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ on:
77
- "!release-2.8"
88
pull_request:
99
branches:
10-
- "main"
10+
- "master"
11+
- "release-*"
1112

1213
concurrency:
1314
group: ${{ github.workflow }}-${{ github.ref }}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: PR check
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- "release-*"
7+
8+
jobs:
9+
test-default-branch:
10+
name: base branch is a default branch
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: fail if base branch is not default branch
14+
if: ${{ github.event.pull_request.base.ref != github.event.repository.default_branch }}
15+
uses: actions/github-script@v3
16+
with:
17+
script: |
18+
core.setFailed("Base branch of the PR - ${{ github.event.pull_request.base.ref }} is not a default branch. Please reopen your PR to ${{ github.event.repository.default_branch }}")

0 commit comments

Comments
 (0)