Skip to content

Commit 6563bea

Browse files
committed
iox-#2270 Update CI to use main branch
1 parent 34aa843 commit 6563bea

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.cirrus.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
---
1414

1515
#
16-
# Filter to run the CI only on the master and release branches or for pull request to the master, release* and iox-* branches
16+
# Filter to run the CI only on the main and release branches or for pull request to the main, release* and iox-* branches
1717
#
1818

19-
only_if: $CIRRUS_BRANCH == 'master'
19+
only_if: $CIRRUS_BRANCH == 'main'
2020
|| $CIRRUS_BRANCH == 'release*'
21-
|| ($CIRRUS_PR != '' && ($CIRRUS_BASE_BRANCH == 'master'
21+
|| ($CIRRUS_PR != '' && ($CIRRUS_BASE_BRANCH == 'main'
2222
|| $CIRRUS_BASE_BRANCH == 'release*'
2323
|| $CIRRUS_BASE_BRANCH == 'iox-*'
2424
)

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ E.g. Ubuntu 18.04 LTS
1616
E.g. GCC 7.4.0
1717

1818
**Eclipse iceoryx version:**
19-
E.g. `v1.2.3` or `master` branch
19+
E.g. `v1.2.3` or `main` branch
2020

2121
**Observed result or behaviour:**
2222
A clear and precise description of the observed result.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
[commit-guidelines]: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
2222
[eca]: http://www.eclipse.org/legal/ECA.php
23-
[contributing]: https://github.com/eclipse-iceoryx/iceoryx/blob/master/CONTRIBUTING.md#coding-style
24-
[testing]: https://github.com/eclipse-iceoryx/iceoryx/blob/master/doc/website/concepts/best-practice-for-testing.md
25-
[changelog]: https://github.com/eclipse-iceoryx/iceoryx/blob/master/doc/website/release-notes/iceoryx-unreleased.md
23+
[contributing]: https://github.com/eclipse-iceoryx/iceoryx/blob/main/CONTRIBUTING.md#coding-style
24+
[testing]: https://github.com/eclipse-iceoryx/iceoryx/blob/main/doc/website/concepts/best-practice-for-testing.md
25+
[changelog]: https://github.com/eclipse-iceoryx/iceoryx/blob/main/doc/website/release-notes/iceoryx-unreleased.md
2626

2727
## Checklist for the PR Reviewer
2828

.github/workflows/build-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
name: Build & Test
44

5-
# Triggers the workflow on push or pull request events but only for the master branch
5+
# Triggers the workflow on push or pull request events but only for the main branch
66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ master, release*, iox-* ]
10+
branches: [ main, release*, iox-* ]
1111

1212
jobs:
1313
pre-flight-check:

.github/workflows/lint_pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Code Linting on Pull-Requests
22

33
on:
44
pull_request:
5-
branches: [ master, release*, iox-* ]
5+
branches: [ main, release*, iox-* ]
66

77
jobs:
88
clang-tidy-review:

0 commit comments

Comments
 (0)