Skip to content

Commit

Permalink
Merge branch 'FieldRobotEvent:ros2-ign' into ros2-ign
Browse files Browse the repository at this point in the history
  • Loading branch information
Rick-v-E authored Apr 17, 2024
2 parents adfc65d + 90a2d44 commit b102ccf
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 12 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/ros-humble-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: ros-humble

on:
workflow_dispatch:
branches:
- ros2
pull_request:
branches:
- ros2
Expand All @@ -16,7 +14,7 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: ros-tooling/setup-ros@v0.6
- uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: humble
- uses: ros-tooling/[email protected]
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ros-iron-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: ros-iron

on:
workflow_dispatch:
branches:
- ros2
pull_request:
branches:
- ros2
Expand All @@ -16,7 +14,7 @@ jobs:
build:
runs-on: ubuntu-22.04
steps:
- uses: ros-tooling/setup-ros@v0.6
- uses: ros-tooling/setup-ros@v0.7
with:
required-ros-distributions: iron
- uses: ros-tooling/[email protected]
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ros-rolling-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: ros-rolling

on:
workflow_dispatch:
branches:
- ros2
pull_request:
branches:
- ros2
Expand All @@ -14,9 +12,11 @@ on:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
container:
image: ubuntu:noble
steps:
- uses: ros-tooling/setup-ros@v0.6
- uses: ros-tooling/setup-ros@master
with:
required-ros-distributions: rolling
- uses: ros-tooling/[email protected]
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Virtual Maize Field

<p float="left" align="middle">
<img src="https://www.fieldrobot.com/event/wp-content/uploads/2021/05/FRE-logo-v03.png" width="250">
<img src="misc/FRE-logo.png" width="250">
</p>
<p float="left" align="middle">
<img src="https://www.fieldrobot.com/event/wp-content/uploads/2021/02/WUR_RGB_standard-1-300x57.png" width="250" style="margin: 10px;">
<img src="misc/WUR-logo.png" width="250" style="margin: 10px;">
<img src="https://www.uni-hohenheim.de/typo3conf/ext/uni_layout/Resources/Public/Images/uni-logo-en.svg" width="250" style="margin: 10px;">
<img src="https://kamaro-engineering.de/wp-content/uploads/2015/03/Kamaro_Logo-1.png" width="250" style="margin: 10px;">
</p>
Expand Down
Binary file added misc/FRE-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added misc/WUR-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b102ccf

Please sign in to comment.