Skip to content

Commit 305647f

Browse files
committed
Remove force setting exit code in CI ctest script
1 parent b2eef9e commit 305647f

File tree

4 files changed

+24
-23
lines changed

4 files changed

+24
-23
lines changed

.ci.cmake

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ else()
152152
)
153153
get_filename_component(toupload llfio-v2.0-binaries-linux-armhf.tgz ABSOLUTE)
154154
endif()
155-
if(EXISTS "prebuilt/lib/libllfio_dl-2.0-Darwin-x86_64-Release.dylib")
155+
if(EXISTS "prebuilt/lib/libllfio_dl-2.0-Darwin-arm64-Release.dylib")
156156
file(DOWNLOAD "https://github.com/ned14/outcome/tarball/master" "${CMAKE_CURRENT_LIST_DIR}/outcome.tgz")
157157
file(DOWNLOAD "https://github.com/ned14/quickcpplib/tarball/master" "${CMAKE_CURRENT_LIST_DIR}/quickcpplib.tgz")
158158
checked_execute_process("Tarring up binaries 0"
@@ -168,17 +168,17 @@ else()
168168
COMMAND "${CMAKE_COMMAND}" -E copy index.html llfio/
169169
COMMAND "${CMAKE_COMMAND}" -E copy Licence.txt llfio/
170170
COMMAND "${CMAKE_COMMAND}" -E copy Readme.md llfio/
171-
COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/lib/libllfio_sl-2.0-Darwin-x86_64-Release.a llfio/prebuilt/lib/
172-
COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/lib/libllfio_dl-2.0-Darwin-x86_64-Release.dylib llfio/prebuilt/lib/
171+
COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/lib/libllfio_sl-2.0-Darwin-arm64-Release.a llfio/prebuilt/lib/
172+
COMMAND "${CMAKE_COMMAND}" -E copy prebuilt/lib/libllfio_dl-2.0-Darwin-arm64-Release.dylib llfio/prebuilt/lib/
173173
)
174174
checked_execute_process("Tarring up binaries 2"
175175
COMMAND bash -c "mv ned14-outcome* llfio/include/outcome"
176176
COMMAND bash -c "mv ned14-quickcpplib* llfio/include/quickcpplib"
177177
)
178178
checked_execute_process("Tarring up binaries 3"
179-
COMMAND "${CMAKE_COMMAND}" -E tar cfz llfio-v2.0-binaries-darwin-x64.tgz llfio
179+
COMMAND "${CMAKE_COMMAND}" -E tar cfz llfio-v2.0-binaries-darwin-arm64.tgz llfio
180180
)
181-
get_filename_component(toupload llfio-v2.0-binaries-darwin-x64.tgz ABSOLUTE)
181+
get_filename_component(toupload llfio-v2.0-binaries-darwin-arm64.tgz ABSOLUTE)
182182
endif()
183183
endif()
184184
set(retval2 0)
@@ -205,6 +205,5 @@ ctest_submit()
205205
if(NOT retval EQUAL 0 OR NOT retval2 EQUAL 0 OR NOT retval3 EQUAL 0)
206206
message(FATAL_ERROR "FATAL: Running tests exited with ${retval} ${retval2} ${retval3}")
207207
else()
208-
message(STATUS "Running tests exited with ${retval} ${retval2} ${retval3}")
209-
cmake_language(EXIT 0)
208+
message(STATUS "SUCCESS: Running tests exited with ${retval} ${retval2} ${retval3}")
210209
endif()

.github/workflows/make_release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ jobs:
131131
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
132132
with:
133133
upload_url: ${{ steps.create_release.outputs.upload_url }}
134-
asset_path: artifacts/Mac OS error_code prebuilt binaries/llfio-v2.0-binaries-darwin-x64.tgz
135-
asset_name: llfio-v2.0-binaries-macos-11-x64-error_code.tgz
134+
asset_path: artifacts/Mac OS error_code prebuilt binaries/llfio-v2.0-binaries-darwin-arm64.tgz
135+
asset_name: llfio-v2.0-binaries-macos-arm64-error_code.tgz
136136
asset_content_type: application/gzip
137137

138138
- name: Upload MacOS 2
@@ -142,8 +142,8 @@ jobs:
142142
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
143143
with:
144144
upload_url: ${{ steps.create_release.outputs.upload_url }}
145-
asset_path: artifacts/Mac OS status_code prebuilt binaries/llfio-v2.0-binaries-darwin-x64.tgz
146-
asset_name: llfio-v2.0-binaries-macos-11-x64-status_code.tgz
145+
asset_path: artifacts/Mac OS status_code prebuilt binaries/llfio-v2.0-binaries-darwin-arm64.tgz
146+
asset_name: llfio-v2.0-binaries-macos-arm64-status_code.tgz
147147
asset_content_type: application/gzip
148148

149149
- name: Upload Windows 1

include/llfio/revision.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
// Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time
2-
#define LLFIO_PREVIOUS_COMMIT_REF f51d47933cf4cdf7ac0766818f1bed6ff39b779e
3-
#define LLFIO_PREVIOUS_COMMIT_DATE "2024-08-22 09:34:43 +00:00"
4-
#define LLFIO_PREVIOUS_COMMIT_UNIQUE f51d4793
2+
#define LLFIO_PREVIOUS_COMMIT_REF b2eef9e053c35ca7b8d7678169e578893b03fb9e
3+
#define LLFIO_PREVIOUS_COMMIT_DATE "2024-08-22 12:11:35 +00:00"
4+
#define LLFIO_PREVIOUS_COMMIT_UNIQUE b2eef9e0

test/tests/process_handle.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,16 @@ static inline void TestProcessHandle(bool with_redirection)
4141
{
4242
for(auto &i : *myenv)
4343
{
44-
if(visit(i, [](auto sv) -> bool {
45-
if(sv.size() >= 512)
46-
return false;
47-
using _string_view = std::decay_t<decltype(sv)>;
48-
_string_view a((const typename _string_view::value_type *) "JENKINS_NEDPROD_PASSWORD");
49-
_string_view b((const typename _string_view::value_type *) L"JENKINS_NEDPROD_PASSWORD");
50-
return (sv.npos == sv.find(a)) && (sv.npos == sv.find(b));
51-
}))
44+
if(visit(i,
45+
[](auto sv) -> bool
46+
{
47+
if(sv.size() >= 512)
48+
return false;
49+
using _string_view = std::decay_t<decltype(sv)>;
50+
_string_view a((const typename _string_view::value_type *) "JENKINS_NEDPROD_PASSWORD");
51+
_string_view b((const typename _string_view::value_type *) L"JENKINS_NEDPROD_PASSWORD");
52+
return (sv.npos == sv.find(a)) && (sv.npos == sv.find(b));
53+
}))
5254
{
5355
std::cout << "\n " << i;
5456
}
@@ -63,7 +65,7 @@ static inline void TestProcessHandle(bool with_redirection)
6365
for(size_t n = 0; n < 4; n++)
6466
{
6567
char buffer[64];
66-
sprintf(buffer, "--testchild,%u", (unsigned) n);
68+
snprintf(buffer, 64, "--testchild,%u", (unsigned) n);
6769
llfio::path_view_component arg(buffer);
6870
children.push_back(llfio::process_handle::launch_process(myexepath, {&arg, 1}, flags).value());
6971
}

0 commit comments

Comments
 (0)