Skip to content

Commit 692f00c

Browse files
authored
Hotfix/update GitHub actions (#139)
* Fix GitHub actions
1 parent e042869 commit 692f00c

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

.github/workflows/shared_steps/action.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,24 @@ runs:
33
using: "composite"
44
# Note: working directory will be reset to the repo root for each new step
55
steps:
6+
# Use a fixed CMake version
7+
- name: Set up CMake
8+
uses: jwlawson/actions-setup-cmake@v2
9+
with:
10+
cmake-version: '3.22.1'
11+
612
# Build and install all dependencies to RDK installation directory.
713
- name: Build and install dependencies
814
shell: bash
915
run: |
10-
pwd
16+
cmake --version
1117
cd thirdparty
1218
bash build_and_install_dependencies.sh ~/rdk_install 4
1319
1420
# Configure CMake, then build and install flexiv_rdk library to RDK installation directory.
1521
- name: Build and install library
1622
shell: bash
1723
run: |
18-
pwd
1924
mkdir -p build && cd build
2025
cmake .. -DCMAKE_INSTALL_PREFIX=~/rdk_install
2126
cmake --build . --target install --config Release
@@ -24,7 +29,6 @@ runs:
2429
- name: Build examples
2530
shell: bash
2631
run: |
27-
pwd
2832
cd example
2933
mkdir -p build && cd build
3034
cmake .. -DCMAKE_PREFIX_PATH=~/rdk_install
@@ -34,7 +38,6 @@ runs:
3438
- name: Build tests
3539
shell: bash
3640
run: |
37-
pwd
3841
cd test
3942
mkdir -p build && cd build
4043
cmake .. -DCMAKE_PREFIX_PATH=~/rdk_install

cmake/FlexivInstallLibrary.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ macro(FlexivInstallLibrary)
8282
DESTINATION "lib/cmake/${PROJECT_NAME}"
8383
)
8484

85-
# Override the dummy static lib with the actual static lib
85+
# Replace the dummy static lib with the actual static lib
86+
install(CODE
87+
"file(REMOVE ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX})")
8688
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${RDK_LIB}
8789
DESTINATION ${CMAKE_INSTALL_LIBDIR}
8890
RENAME ${CMAKE_STATIC_LIBRARY_PREFIX}${PROJECT_NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}

thirdparty/scripts/install_Fast-DDS.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ mkdir -p build && cd build
2929
cmake .. $SHARED_CMAKE_ARGS \
3030
-DTHIRDPARTY_Asio=ON \
3131
-DCOMPILE_EXAMPLES=OFF \
32-
-DSQLITE3_SUPPORT=OFF \
33-
-DOPENSSL_USE_STATIC_LIBS=ON
32+
-DSQLITE3_SUPPORT=OFF
3433

3534
# Build and install
3635
cmake --build . --target install --config Release -j $NUM_JOBS

0 commit comments

Comments
 (0)