Skip to content

Commit

Permalink
Update CI to use the main branches.
Browse files Browse the repository at this point in the history
  • Loading branch information
jmackay2 authored and dagar committed Sep 8, 2022
1 parent d4cce45 commit 88bf103
Show file tree
Hide file tree
Showing 14 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Checks
on:
push:
branches:
- 'master'
- 'main'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clang-tidy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Clang Tidy
on:
push:
branches:
- 'master'
- 'main'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Linux Targets
on:
push:
branches:
- 'master'
- 'main'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile_linux_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Linux ARM64 Targets
on:
push:
branches:
- 'master'
- 'main'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: MacOS build
on:
push:
branches:
- 'master'
- 'main'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/compile_nuttx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Nuttx Targets
on:
push:
branches:
- 'master'
- 'main'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy metadata for all targets
on:
push:
branches:
- 'master'
- 'main'
- 'release/*'
- 'pr-metadata-test'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mavros_mission_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: MAVROS Mission Tests
on:
push:
branches:
- 'master'
- 'main'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mavros_offboard_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: MAVROS Offboard Tests
on:
push:
branches:
- 'master'
- 'main'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/metadata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Metadata
on:
push:
branches:
- 'master'
- 'main'
- 'release/*'
- 'pr-metadata-test'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Python CI Checks
on:
push:
branches:
- 'master'
- 'main'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sitl_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: SITL Tests
on:
push:
branches:
- 'master'
- 'main'
pull_request:
branches:
- '*'
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ matrix:
dist: xenial
# In order to stay under the coverity rate limit, we only run this weekly
# and not on push which is configured in travis-ci settings.
if: branch = master
if: branch = main

before_install:
- echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,10 @@ pipeline {
sh('make distclean; git clean -ff -x -d .')
withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_msgs.git")
// 'master' branch
// 'main' branch
sh('./msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')
sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
sh('cd px4_msgs; git push origin master || true')
sh('cd px4_msgs; git push origin main || true')
// 'ros1' branch
sh('cd px4_msgs; git checkout ros1')
sh('./msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')
Expand Down

0 comments on commit 88bf103

Please sign in to comment.