Skip to content

Commit 7fa140f

Browse files
authored
Adds develop branch to CI jobs (#4438)
# Description Enables CI jobs for develop branch. ## Checklist - [x] I have read and understood the [contribution guidelines](https://isaac-sim.github.io/IsaacLab/main/source/refs/contributing.html) - [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with `./isaaclab.sh --format` - [x] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] I have updated the changelog and the corresponding version in the extension's `config/extension.toml` file - [ ] I have added my name to the `CONTRIBUTORS.md` or my name already exists there <!-- As you go through the checklist above, you can mark something as done by putting an x character in it For example, - [x] I have done this task - [ ] I have not done this task -->
1 parent cbf51ab commit 7fa140f

File tree

5 files changed

+19
-8
lines changed

5 files changed

+19
-8
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ name: Build and Test
88
on:
99
pull_request:
1010
branches:
11-
- devel
11+
- develop
1212
- main
1313
- 'release/**'
1414

.github/workflows/check-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
push:
1717
branches:
1818
- main
19-
- devel
19+
- develop
2020
- 'release/**'
2121
paths:
2222
- 'docs/**'

.github/workflows/docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
push:
1010
branches:
1111
- main
12-
- devel
12+
- develop
1313
- 'release/**'
1414
pull_request:
1515
types: [opened, synchronize, reopened]

.github/workflows/postmerge-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
push:
1010
branches:
1111
- main
12-
- devel
12+
- develop
1313
- release/**
1414

1515
# Concurrency control to prevent parallel runs

docker/Dockerfile.curobo

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,13 @@ RUN set -euo pipefail && \
6868
wget -q https://developer.download.nvidia.com/compute/cuda/repos/${cuda_repo}/x86_64/cuda-${cuda_repo}.pin && \
6969
mv cuda-${cuda_repo}.pin /etc/apt/preferences.d/cuda-repository-pin-600 && \
7070
apt-get update && \
71-
apt-get install -y --no-install-recommends cuda-toolkit-12-8 && \
71+
apt-get install -y --no-install-recommends \
72+
cuda-toolkit-12-8 \
73+
libcudnn9-cuda-12 \
74+
libcusparselt0 \
75+
libnccl2 \
76+
libnccl-dev \
77+
libnvjitlink-12-8 && \
7278
apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/*
7379

7480

@@ -115,18 +121,23 @@ RUN touch /bin/nvidia-smi && \
115121
mkdir -p /var/run/nvidia-persistenced && \
116122
touch /var/run/nvidia-persistenced/socket
117123

124+
# HACK: Remove pre-bundled torch BEFORE installing Isaac Lab dependencies.
125+
# This forces isaaclab.sh --install to install torch fresh to site-packages,
126+
# rather than skipping because it detects the pre-bundled version.
127+
RUN rm -rf ${ISAACSIM_ROOT_PATH}/exts/omni.isaac.ml_archive/pip_prebundle/torch*
128+
118129
# installing Isaac Lab dependencies
119130
# use pip caching to avoid reinstalling large packages
120131
RUN --mount=type=cache,target=${DOCKER_USER_HOME}/.cache/pip \
121132
${ISAACLAB_PATH}/isaaclab.sh --install
122133

134+
# HACK: Uninstall quadprog as it causes issues with some reinforcement learning frameworks
135+
RUN ${ISAACLAB_PATH}/isaaclab.sh -p -m pip uninstall -y quadprog
136+
123137
# Install cuRobo from source (pinned commit); needs CUDA env and Torch
124138
RUN ${ISAACLAB_PATH}/isaaclab.sh -p -m pip install --no-build-isolation \
125139
"nvidia-curobo @ git+https://github.com/NVlabs/curobo.git@ebb71702f3f70e767f40fd8e050674af0288abe8"
126140

127-
# HACK: Remove install of quadprog dependency
128-
RUN ${ISAACLAB_PATH}/isaaclab.sh -p -m pip uninstall -y quadprog
129-
130141
# aliasing isaaclab.sh and python for convenience
131142
RUN echo "export ISAACLAB_PATH=${ISAACLAB_PATH}" >> ${HOME}/.bashrc && \
132143
echo "alias isaaclab=${ISAACLAB_PATH}/isaaclab.sh" >> ${HOME}/.bashrc && \

0 commit comments

Comments
 (0)