Skip to content

Commit

Permalink
temp update
Browse files Browse the repository at this point in the history
  • Loading branch information
MrBearing committed Sep 29, 2024
1 parent 8eca2c7 commit 54688ad
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 21 deletions.
10 changes: 2 additions & 8 deletions .github/workflows/humble_docker_test.yaml
Original file line number Diff line number Diff line change
@@ -1,25 +1,19 @@
name: Humble_test_with_docker_NativeROS_string
name: buid_and_test_with_docker_NativeROS_string

on:
push:
branches:
- "main"
pull_request:
types: [opened, synchronize, labeled]
types: [opened, synchronize]
jobs:
ci:
runs-on: ${{ matrix.os }}
if: |
((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'main' )) ||
((github.event.action == 'synchronize') && (github.base_ref == 'main') && contains(github.event.pull_request.labels.*.name, 'TESTING')) ||
(github.ref_name == 'main')
container:
image: osrf/ros:${{ matrix.ros_distribution }}-desktop
timeout-minutes: 5
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
ros_distribution: [humble]
steps:
- name: Checkout code
Expand Down
19 changes: 7 additions & 12 deletions .github/workflows/humble_test.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,22 @@
name: ci_humble
#TODO fix file name and "name:" like build and test

name: build_and_test

on:
push:
branches:
- "main"
- "feat/add_ci_config"
pull_request:
types: [opened, synchronize, labeled]
types: [opened, synchronize ]
jobs:
ci:
runs-on: ${{ matrix.os }}
if: |
((github.event.action == 'labeled') && (github.event.label.name == 'TESTING') && (github.base_ref == 'main' )) ||
((github.event.action == 'synchronize') && (github.base_ref == 'main') && contains(github.event.pull_request.labels.*.name, 'TESTING')) ||
(github.ref_name == 'main')
container:
image: osrf/ros:${{ matrix.ros_distribution }}-desktop
timeout-minutes: 3
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04]
ros_distribution: [humble]
ros_distribution: [humble]
comm-target: [native , mros]
comm-data-type: [string, twist]
steps:
Expand Down Expand Up @@ -74,9 +69,9 @@ jobs:
shell: bash
run : |
./test_echoback_${{ matrix.comm-data-type }}/mros2-posix &
mros_pid=$! # mROSのプロセスIDを取得
mros_pid=$! # get mROS process id
# Native ROSをバックグラウンドで実行
# Run Native ROS in background
cd ws_host/
source /opt/ros/humble/setup.bash
source install/setup.bash
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ sudo apt-get update && sudo apt-get install -y \
libssl-dev libreadline-dev zlib1g-dev \
make autoconf automake cmake \
pkg-config curl \
net-tools netcat jinja2
net-tools netcat python3-jinja2
```

Please check the IP address and netmask of the execution environment.
Expand Down

0 comments on commit 54688ad

Please sign in to comment.