合并:同步主分支最新修改到游戏评分分支
Project CI / Backend tests (pull_request) Has been cancelled
Project CI / Native shell tests (pull_request) Has been cancelled
Project CI / Frontend tests (pull_request) Has been cancelled
Project CI / Repository checks (pull_request) Has been cancelled
Project CI / AI game creator shell web tests (pull_request) Has been cancelled
Project CI / AI game creator shell Rust crates (pull_request) Has been cancelled
Project CI / AI game creator shell Rust lane 1/2 (pull_request) Has been cancelled
Project CI / AI game creator shell Rust lane 2/2 (pull_request) Has been cancelled
Project CI / AI game creator shell Rust smoke (pull_request) Has been cancelled
Project CI / Backend tests (pull_request) Has been cancelled
Project CI / Native shell tests (pull_request) Has been cancelled
Project CI / Frontend tests (pull_request) Has been cancelled
Project CI / Repository checks (pull_request) Has been cancelled
Project CI / AI game creator shell web tests (pull_request) Has been cancelled
Project CI / AI game creator shell Rust crates (pull_request) Has been cancelled
Project CI / AI game creator shell Rust lane 1/2 (pull_request) Has been cancelled
Project CI / AI game creator shell Rust lane 2/2 (pull_request) Has been cancelled
Project CI / AI game creator shell Rust smoke (pull_request) Has been cancelled
合并 origin/master 最新提交并保留评分展示和评价样式修复 # Conflicts: # docs/project-memory/shared-memory/decision-log.md
This commit is contained in:
@@ -2079,6 +2079,12 @@ const checks = [
|
||||
reason:
|
||||
'Server-Provision 必须安装 Pingora 真实路径 canary snippet,供人工启用直连前中间验证。',
|
||||
},
|
||||
{
|
||||
file: 'scripts/jenkins-server-provision.sh',
|
||||
includes: 'genarrative-host-extras.conf',
|
||||
reason:
|
||||
'Server-Provision 必须安装生产机 host-only snippet,避免 provision 后内部工具页与官网首页入口丢失。',
|
||||
},
|
||||
{
|
||||
file: 'scripts/jenkins-server-provision.sh',
|
||||
includes: 'genarrative-pingora-gateway',
|
||||
|
||||
@@ -1094,13 +1094,16 @@ install_nginx_config_with_rollback() {
|
||||
local snippet_target="/etc/nginx/snippets/genarrative-maintenance.conf"
|
||||
local pingora_canary_snippet_target="/etc/nginx/snippets/genarrative-pingora-canary.conf"
|
||||
local pingora_realpath_canary_snippet_target="/etc/nginx/snippets/genarrative-pingora-realpath-canary.conf"
|
||||
local host_extras_snippet_target="/etc/nginx/snippets/genarrative-host-extras.conf"
|
||||
local config_source
|
||||
local rendered_config rendered_snippet rendered_pingora_canary_snippet rendered_pingora_realpath_canary_snippet
|
||||
local config_backup snippet_backup pingora_canary_snippet_backup pingora_realpath_canary_snippet_backup disabled_sites
|
||||
local rendered_host_extras_snippet
|
||||
local config_backup snippet_backup pingora_canary_snippet_backup pingora_realpath_canary_snippet_backup host_extras_snippet_backup disabled_sites
|
||||
local had_config="false"
|
||||
local had_snippet="false"
|
||||
local had_pingora_canary_snippet="false"
|
||||
local had_pingora_realpath_canary_snippet="false"
|
||||
local had_host_extras_snippet="false"
|
||||
|
||||
run_cmd mkdir -p /etc/nginx/snippets /etc/nginx/conf.d
|
||||
if [[ "${NGINX_CONFIG_MODE}" == "production-https" ]]; then
|
||||
@@ -1116,6 +1119,7 @@ install_nginx_config_with_rollback() {
|
||||
echo "+ install -m 0644 deploy/nginx/snippets/genarrative-maintenance.conf ${snippet_target}"
|
||||
echo "+ install -m 0644 deploy/nginx/snippets/genarrative-pingora-canary.conf ${pingora_canary_snippet_target}"
|
||||
echo "+ install -m 0644 deploy/nginx/snippets/genarrative-pingora-realpath-canary.conf ${pingora_realpath_canary_snippet_target}"
|
||||
echo "+ install -m 0644 deploy/nginx/snippets/genarrative-host-extras.conf ${host_extras_snippet_target}"
|
||||
|
||||
if [[ "${DRY_RUN}" == "true" ]]; then
|
||||
echo "+ disable /etc/nginx/sites-enabled/default* if present"
|
||||
@@ -1128,10 +1132,12 @@ install_nginx_config_with_rollback() {
|
||||
rendered_snippet="$(mktemp)"
|
||||
rendered_pingora_canary_snippet="$(mktemp)"
|
||||
rendered_pingora_realpath_canary_snippet="$(mktemp)"
|
||||
rendered_host_extras_snippet="$(mktemp)"
|
||||
config_backup="$(mktemp)"
|
||||
snippet_backup="$(mktemp)"
|
||||
pingora_canary_snippet_backup="$(mktemp)"
|
||||
pingora_realpath_canary_snippet_backup="$(mktemp)"
|
||||
host_extras_snippet_backup="$(mktemp)"
|
||||
disabled_sites="$(mktemp)"
|
||||
if [[ "${NGINX_CONFIG_MODE}" == "production-https" ]]; then
|
||||
validate_nginx_tls
|
||||
@@ -1142,6 +1148,7 @@ install_nginx_config_with_rollback() {
|
||||
cp deploy/nginx/snippets/genarrative-maintenance.conf "${rendered_snippet}"
|
||||
cp deploy/nginx/snippets/genarrative-pingora-canary.conf "${rendered_pingora_canary_snippet}"
|
||||
cp deploy/nginx/snippets/genarrative-pingora-realpath-canary.conf "${rendered_pingora_realpath_canary_snippet}"
|
||||
cp deploy/nginx/snippets/genarrative-host-extras.conf "${rendered_host_extras_snippet}"
|
||||
|
||||
if [[ -f "${config_target}" ]]; then
|
||||
cp -p "${config_target}" "${config_backup}"
|
||||
@@ -1159,11 +1166,16 @@ install_nginx_config_with_rollback() {
|
||||
cp -p "${pingora_realpath_canary_snippet_target}" "${pingora_realpath_canary_snippet_backup}"
|
||||
had_pingora_realpath_canary_snippet="true"
|
||||
fi
|
||||
if [[ -f "${host_extras_snippet_target}" ]]; then
|
||||
cp -p "${host_extras_snippet_target}" "${host_extras_snippet_backup}"
|
||||
had_host_extras_snippet="true"
|
||||
fi
|
||||
|
||||
install -m 0644 "${rendered_config}" "${config_target}"
|
||||
install -m 0644 "${rendered_snippet}" "${snippet_target}"
|
||||
install -m 0644 "${rendered_pingora_canary_snippet}" "${pingora_canary_snippet_target}"
|
||||
install -m 0644 "${rendered_pingora_realpath_canary_snippet}" "${pingora_realpath_canary_snippet_target}"
|
||||
install -m 0644 "${rendered_host_extras_snippet}" "${host_extras_snippet_target}"
|
||||
disable_nginx_default_sites_enabled "${disabled_sites}"
|
||||
|
||||
if ! nginx -t; then
|
||||
@@ -1188,14 +1200,19 @@ install_nginx_config_with_rollback() {
|
||||
else
|
||||
rm -f "${pingora_realpath_canary_snippet_target}"
|
||||
fi
|
||||
if [[ "${had_host_extras_snippet}" == "true" ]]; then
|
||||
cp -p "${host_extras_snippet_backup}" "${host_extras_snippet_target}"
|
||||
else
|
||||
rm -f "${host_extras_snippet_target}"
|
||||
fi
|
||||
restore_nginx_default_sites_enabled "${disabled_sites}"
|
||||
rm -f "${rendered_config}" "${rendered_snippet}" "${rendered_pingora_canary_snippet}" "${rendered_pingora_realpath_canary_snippet}" "${config_backup}" "${snippet_backup}" "${pingora_canary_snippet_backup}" "${pingora_realpath_canary_snippet_backup}" "${disabled_sites}"
|
||||
rm -f "${rendered_config}" "${rendered_snippet}" "${rendered_pingora_canary_snippet}" "${rendered_pingora_realpath_canary_snippet}" "${rendered_host_extras_snippet}" "${config_backup}" "${snippet_backup}" "${pingora_canary_snippet_backup}" "${pingora_realpath_canary_snippet_backup}" "${host_extras_snippet_backup}" "${disabled_sites}"
|
||||
exit 1
|
||||
fi
|
||||
echo "+ nginx -s reload"
|
||||
nginx -s reload
|
||||
|
||||
rm -f "${rendered_config}" "${rendered_snippet}" "${rendered_pingora_canary_snippet}" "${rendered_pingora_realpath_canary_snippet}" "${config_backup}" "${snippet_backup}" "${pingora_canary_snippet_backup}" "${pingora_realpath_canary_snippet_backup}" "${disabled_sites}"
|
||||
rm -f "${rendered_config}" "${rendered_snippet}" "${rendered_pingora_canary_snippet}" "${rendered_pingora_realpath_canary_snippet}" "${rendered_host_extras_snippet}" "${config_backup}" "${snippet_backup}" "${pingora_canary_snippet_backup}" "${pingora_realpath_canary_snippet_backup}" "${host_extras_snippet_backup}" "${disabled_sites}"
|
||||
}
|
||||
|
||||
cleanup_placeholder_nginx_config() {
|
||||
@@ -1417,6 +1434,7 @@ require_path deploy/nginx/genarrative-dev-http.conf
|
||||
require_path deploy/nginx/snippets/genarrative-maintenance.conf
|
||||
require_path deploy/nginx/snippets/genarrative-pingora-canary.conf
|
||||
require_path deploy/nginx/snippets/genarrative-pingora-realpath-canary.conf
|
||||
require_path deploy/nginx/snippets/genarrative-host-extras.conf
|
||||
require_path deploy/logrotate/genarrative-pingora-gateway
|
||||
require_path deploy/env/api-server.env.example
|
||||
require_path deploy/env/external-generation-worker.env.example
|
||||
|
||||
Reference in New Issue
Block a user