Skip to content

Commit

Permalink
Merge pull request #514 from k-okada/fix_ci
Browse files Browse the repository at this point in the history
  • Loading branch information
k-okada authored Dec 26, 2024
2 parents fb32bec + 1851db3 commit 84e9574
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
21 changes: 20 additions & 1 deletion .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,11 @@ jobs:
CATKIN_PARALLEL_JOBS: "-i"


container: ${{ matrix.CONTAINER }}
container:
image: ${{ matrix.CONTAINER }}
volumes:
- /tmp/node20:/__e/node20

steps:
- name: Install latest git ( use sudo for ros-ubuntu )
run: |
Expand All @@ -63,6 +67,21 @@ jobs:
git config --global --add safe.directory $GITHUB_WORKSPACE
fi
- name: Try to replace `node` with an glibc 2.17
shell: bash
run: |
if [ "${{ matrix.CONTAINER }}" = "jskrobotics/ros-ubuntu:14.04" ]; then
export USER=$(whoami)
sudo chmod 777 -R /__e/node20
sudo chown -R $USER /__e/node20
fi
ls -lar /__e/node20 &&
sudo apt-get install -y curl &&
curl -Lo /tmp/node.tar.gz https://unofficial-builds.nodejs.org/download/release/v20.17.0/node-v20.17.0-linux-x64-glibc-217.tar.gz &&
cd /__e/node20 &&
tar -x --strip-components=1 -f /tmp/node.tar.gz &&
ls -lar /__e/node20/bin/
- name: Checkout
uses: actions/[email protected]

Expand Down
2 changes: 2 additions & 0 deletions 3rdparty/nlopt/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ add_custom_target(libnlopt_cxx ALL
DEPENDS ${CATKIN_DEVEL_PREFIX}/lib/libnlopt_cxx.so)
add_custom_command(OUTPUT
${CATKIN_DEVEL_PREFIX}/lib/libnlopt_cxx.so
COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/build
COMMAND cp ${PROJECT_SOURCE_DIR}/build/nlopt-2.3.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/build
COMMAND cp ${PROJECT_SOURCE_DIR}/nlopt-2.3.tar.gz.md5sum ${CMAKE_CURRENT_BINARY_DIR}
COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/tmp
COMMAND cmake -E chdir ${CMAKE_CURRENT_BINARY_DIR} make -f ${PROJECT_SOURCE_DIR}/Makefile DSTDIR=${CMAKE_CURRENT_BINARY_DIR}/tmp MK_DIR=${mk_PREFIX}/share/mk
Expand Down

0 comments on commit 84e9574

Please sign in to comment.