Sync from GitHub main #1

Open
nomad wants to merge 145 commits from sync/from-github into main
Showing only changes of commit 61be20a88a - Show all commits
+13 -1
View File
@@ -19,6 +19,12 @@ if(EXISTS "${_stage_bans}")
file(READ "${_stage_bans}" _preserve_bans)
endif()
set(_stage_admin_token "${CO_SERVER_STAGE_DIR}/.admin-token")
set(_preserve_admin_token "")
if(EXISTS "${_stage_admin_token}")
file(READ "${_stage_admin_token}" _preserve_admin_token)
endif()
file(REMOVE_RECURSE "${CO_SERVER_STAGE_DIR}")
file(MAKE_DIRECTORY "${CO_SERVER_STAGE_DIR}")
@@ -30,7 +36,8 @@ foreach(_entry IN LISTS _server_entries)
OR _entry STREQUAL ".venv"
OR _entry STREQUAL "logs"
OR _entry STREQUAL "tests"
OR _entry STREQUAL "bans.json")
OR _entry STREQUAL "bans.json"
OR _entry STREQUAL ".admin-token")
continue()
endif()
file(COPY "${CO_SERVER_SOURCE_DIR}/${_entry}"
@@ -41,6 +48,7 @@ foreach(_entry IN LISTS _server_entries)
PATTERN ".venv" EXCLUDE
PATTERN "logs" EXCLUDE
PATTERN "bans.json" EXCLUDE
PATTERN ".admin-token" EXCLUDE
)
endforeach()
@@ -52,6 +60,10 @@ if(NOT "${_preserve_bans}" STREQUAL "")
file(WRITE "${_stage_bans}" "${_preserve_bans}")
endif()
if(NOT "${_preserve_admin_token}" STREQUAL "")
file(WRITE "${_stage_admin_token}" "${_preserve_admin_token}")
endif()
if(NOT EXISTS "${CO_SERVER_STAGE_DIR}/consumer_server_cli.py")
message(FATAL_ERROR
"Failed to stage server entrypoint to ${CO_SERVER_STAGE_DIR}/consumer_server_cli.py")