Skip to content

Commit

Permalink
Merge pull request #102 from hoffmann-stefan/fix/rename-main-branch
Browse files Browse the repository at this point in the history
Fixup rename main branch
  • Loading branch information
hoffmann-stefan authored May 3, 2023
2 parents 95decd0 + 09737b9 commit a17baa0
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 141 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/build_desktop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Build (Desktop)
on: [push, pull_request]
on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build-desktop:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_linux.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Build (Linux)
on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build-linux:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_uwp.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Build (UWP)
on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

jobs:
build-uwp:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.repos
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ repositories:
version: foxy
ros2_dotnet/dotnet_cmake_module:
type: git
url: https://github.com/ms-iot/dotnet_cmake_module.git
url: https://github.com/ros2-dotnet/dotnet_cmake_module.git
version: main
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ can/should be omitted if building on top of a built-from-source ROS2 workspace)
call \dev\ros2_foxy\local_setup.bat
md \dev\ros2_dotnet_ws\src
cd \dev\ros2_dotnet_ws
curl -sk https://raw.githubusercontent.com/ros2-dotnet/ros2_dotnet/master/ros2_dotnet_foxy.repos -o ros2_dotnet_foxy.repos
curl -sk https://raw.githubusercontent.com/ros2-dotnet/ros2_dotnet/main/ros2_dotnet_foxy.repos -o ros2_dotnet_foxy.repos
vcs import \dev\ros2_dotnet_ws\src < ros2_dotnet_foxy.repos
git clone --branch foxy https://github.com/ros2/rosidl src\ros2\rosidl
colcon build --merge-install
Expand All @@ -90,7 +90,7 @@ Assuming ROS2 foxy installed to the standard location, run the following command
source /opt/ros/foxy/setup.bash
mkdir -p ~/ros2_dotnet_ws/src
cd ~/ros2_dotnet_ws
wget https://raw.githubusercontent.com/ros2-dotnet/ros2_dotnet/master/ros2_dotnet_foxy.repos
wget https://raw.githubusercontent.com/ros2-dotnet/ros2_dotnet/main/ros2_dotnet_foxy.repos
vcs import ~/ros2_dotnet_ws/src < ros2_dotnet_foxy.repos
colcon build
```
Expand All @@ -111,7 +111,7 @@ ament
```
md \dev\ament\src
cd \dev\ament
curl -sk https://raw.githubusercontent.com/ros2-dotnet/ros2_dotnet/master/ament_dotnet_uwp.repos -o ament_dotnet_uwp.repos
curl -sk https://raw.githubusercontent.com/ros2-dotnet/ros2_dotnet/main/ament_dotnet_uwp.repos -o ament_dotnet_uwp.repos
vcs import src < ament_dotnet_uwp.repos
colcon build --merge-install
call install\local_setup.bat
Expand All @@ -125,7 +125,7 @@ Replace `%TARGET_ARCH%` with Win32 or x64
```
md \dev\ros2\src
cd \dev\ros2
curl -sk https://raw.githubusercontent.com/ros2-dotnet/ros2_dotnet/master/ros2_dotnet_uwp.repos -o ros2_dotnet_uwp.repos
curl -sk https://raw.githubusercontent.com/ros2-dotnet/ros2_dotnet/main/ros2_dotnet_uwp.repos -o ros2_dotnet_uwp.repos
vcs import src < ros2_dotnet_uwp.repos
cd \dev\ament
call install\local_setup.bat
Expand Down
131 changes: 0 additions & 131 deletions ci/build-all-steps.yml

This file was deleted.

0 comments on commit a17baa0

Please sign in to comment.