Skip to content

Commit 791e5fd

Browse files
committed
[.github/workflows/linux-Windows-macOS-sunOS.yml] Manually wget greatest as SunOS cmake isn't downloading properly
1 parent 041a0ab commit 791e5fd

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/linux-Windows-macOS-sunOS.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ jobs:
2424
prepare: pkg install cmake
2525
run: |
2626
mkdir build && cd build
27+
mkdir c89stringutils_tests/test_downloads
28+
/opt/ooce/bin/wget https://raw.githubusercontent.com/silentbicycle/greatest/11a6af1/greatest.h -o c89stringutils_tests/test_downloads/greatest.h
2729
/opt/ooce/bin/cmake -DCMAKE_BUILD_TYPE="Debug" ..
2830
/opt/ooce/bin/cmake --build .
2931
/opt/ooce/bin/ctest -C Debug .

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if (APPLE)
5555
set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Info.plist")
5656
set(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Info.plist")
5757
set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/cmake/CustomVolumeIcon.icns")
58-
endif()
58+
endif (APPLE)
5959
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/LICENSE.txt")
6060
set(CPACK_PACKAGE_VERSION_MAJOR "${${PROJECT_NAME}_VERSION_MAJOR}")
6161
set(CPACK_PACKAGE_VERSION_MINOR "${${PROJECT_NAME}_VERSION_MINOR}")

c89stringutils_tests/test_c89stringutils/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ set(DOWNLOAD_DIR "${PROJECT_BINARY_DIR}/test_downloads")
99
file(MAKE_DIRECTORY "${DOWNLOAD_DIR}")
1010

1111
set(GREATEST_SHA256 "1292593d95c35eeccc89ffa1c91d6fe53b49f81cbf2c2b7758842b7f3186fcc2")
12-
file(DOWNLOAD "https://raw.githubusercontent.com/silentbicycle/greatest/11a6af1/greatest.h"
13-
"${DOWNLOAD_DIR}/greatest.h")
1412
if (NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
13+
file(DOWNLOAD "https://raw.githubusercontent.com/silentbicycle/greatest/11a6af1/greatest.h"
14+
"${DOWNLOAD_DIR}/greatest.h")
1515
file(SHA256 "${DOWNLOAD_DIR}/greatest.h" GREATEST_SHA256_FOUND)
1616
if (NOT GREATEST_SHA256_FOUND STREQUAL GREATEST_SHA256)
1717
message(FATAL_ERROR "Hashes don't match on \"${DOWNLOAD_DIR}/greatest.h\" download")
1818
endif (NOT GREATEST_SHA256_FOUND STREQUAL GREATEST_SHA256)
19-
endif (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
19+
endif (NOT CMAKE_SYSTEM_NAME STREQUAL "SunOS")
2020

2121
#########
2222
# Tests #

0 commit comments

Comments
 (0)