Skip to content

Commit 8680ac1

Browse files
committed
update CI to get correct r2s_gw branch
1 parent 482dd11 commit 8680ac1

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

.github/workflows/debian-packages.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,8 @@ jobs:
210210
apt-get install -y git
211211
212212
# Try to clone the matching branch, fallback to main if it doesn't exist
213-
BRANCH_NAME="${{ github.ref_name }}"
213+
# Use head_ref for PRs (actual branch name), ref_name for pushes
214+
BRANCH_NAME="${{ github.head_ref || github.ref_name }}"
214215
if git ls-remote --exit-code --heads https://github.com/NVIDIA-ISAAC-ROS/r2s_gw.git "$BRANCH_NAME" > /dev/null 2>&1; then
215216
echo "Cloning r2s_gw branch: $BRANCH_NAME"
216217
git clone --branch "$BRANCH_NAME" --depth 1 https://github.com/NVIDIA-ISAAC-ROS/r2s_gw.git

.github/workflows/ros-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ jobs:
6060
apt-get install -y git
6161
6262
# Try to clone the matching branch, fallback to main if it doesn't exist
63-
BRANCH_NAME="${{ github.ref_name }}"
63+
# Use head_ref for PRs (actual branch name), ref_name for pushes
64+
BRANCH_NAME="${{ github.head_ref || github.ref_name }}"
6465
if git ls-remote --exit-code --heads https://github.com/NVIDIA-ISAAC-ROS/r2s_gw.git "$BRANCH_NAME" > /dev/null 2>&1; then
6566
echo "Cloning r2s_gw branch: $BRANCH_NAME"
6667
git clone --branch "$BRANCH_NAME" --depth 1 https://github.com/NVIDIA-ISAAC-ROS/r2s_gw.git r2s_gw

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,18 @@ For users who want an advanced, feature-rich terminal interface, **r2s_gw** is a
7777

7878
To use r2s_gw:
7979

80-
1. Clone the r2s_gw repository into your workspace:
80+
1. Clone the r2s_gw repository into a workspace:
8181
```bash
82-
cd ros_ws/src
82+
mkdir -p ~/ros_ws/src
83+
cd ~/ros_ws/src
8384
git clone https://github.com/NVIDIA-ISAAC-ROS/r2s_gw.git
84-
cd ../..
8585
```
8686

8787
2. Install dependencies and build:
8888
```bash
89-
pip install textual
90-
colcon build --packages-up-to r2s_gw
89+
pip install --ignore-installed pygments -r r2s_gw/requirements.txt
90+
cd ~/ros_ws
91+
colcon build --packages-select r2s_gw
9192
source install/setup.bash
9293
```
9394

r2s_gw

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit d305a54647bf02329d7e48a3b941befc807e04c7

0 commit comments

Comments
 (0)