Skip to content

Commit

Permalink
iox-#2270 Update CI to use main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
elBoberido committed Apr 22, 2024
1 parent 34aa843 commit 6563bea
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .cirrus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
---

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

only_if: $CIRRUS_BRANCH == 'master'
only_if: $CIRRUS_BRANCH == 'main'
|| $CIRRUS_BRANCH == 'release*'
|| ($CIRRUS_PR != '' && ($CIRRUS_BASE_BRANCH == 'master'
|| ($CIRRUS_PR != '' && ($CIRRUS_BASE_BRANCH == 'main'
|| $CIRRUS_BASE_BRANCH == 'release*'
|| $CIRRUS_BASE_BRANCH == 'iox-*'
)
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ E.g. Ubuntu 18.04 LTS
E.g. GCC 7.4.0

**Eclipse iceoryx version:**
E.g. `v1.2.3` or `master` branch
E.g. `v1.2.3` or `main` branch

**Observed result or behaviour:**
A clear and precise description of the observed result.
Expand Down
6 changes: 3 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@

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

## Checklist for the PR Reviewer

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

name: Build & Test

# Triggers the workflow on push or pull request events but only for the master branch
# Triggers the workflow on push or pull request events but only for the main branch
on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master, release*, iox-* ]
branches: [ main, release*, iox-* ]

jobs:
pre-flight-check:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint_pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Code Linting on Pull-Requests

on:
pull_request:
branches: [ master, release*, iox-* ]
branches: [ main, release*, iox-* ]

jobs:
clang-tidy-review:
Expand Down

0 comments on commit 6563bea

Please sign in to comment.