From e95eb98882e15396a0013186d8412193f5e6bf5e Mon Sep 17 00:00:00 2001 From: jak1 Date: Tue, 23 Mar 2021 14:58:07 +0100 Subject: removed 'change me' comments (already fixed) --- pages.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pages.sh b/pages.sh index 811859d..7463e55 100644 --- a/pages.sh +++ b/pages.sh @@ -8,13 +8,15 @@ mode_file="mode.txt" mirror_file="mirrorlist" if [[ ${CI_PROJECT_DIR} == "" ]]; then - version_url="https://jak89_1.gitlab.io/docker-testing/${version_file}" # change me! - version_url2="https://gitlab.com/jak89_1/docker-testing/-/jobs/artifacts/master/raw/$deploy_dir/${version_file}?job=pages" # change me + project="docker-testing" # change me + namespace="jak89_1" # change me + version_url="https://${namespace}.gitlab.io/${project}/${version_file}" + version_url2="https://gitlab.com/${project}/${project}/-/jobs/artifacts/master/raw/$deploy_dir/${version_file}?job=pages" echo "[NON CI] : using local paths" local=1 else version_url="${CI_PAGES_URL}/${version_file}" - version_url2="https://gitlab.com/${CI_PROJECT_PATH}/-/jobs/artifacts/master/raw/$deploy_dir/${version_file}?job=${CI_JOB_NAME}" # change me + version_url2="https://gitlab.com/${CI_PROJECT_PATH}/-/jobs/artifacts/master/raw/$deploy_dir/${version_file}?job=${CI_JOB_NAME}" local=0 fi version_url3="https://manaplus.germantmw.de/versions/${version_file}" # fallback to my server if gitlab breaks its own pages *blames gitlab* @@ -23,8 +25,8 @@ version_url3="https://manaplus.germantmw.de/versions/${version_file}" # fallback mirror_names=("gitlab.io gertmw.de") mirror_urls=("https://themanaworld.gitlab.io/manaplus/builder/ https://manaplus.germantmw.de/versions/") # change me -last_checksum="https://gitlab.com/${CI_PROJECT_PATH}/-/jobs/artifacts/master/raw/build/${checksum_file}?job=mxe_gcc5" # change me -#last_checksum_d="https://gitlab.com/${CI_PROJECT_PATH}/-/jobs/artifacts/master/raw/build/debug-${checksum_file}?job=mxe_gcc5" # change me # not handled yet +last_checksum="https://gitlab.com/${CI_PROJECT_PATH}/-/jobs/artifacts/master/raw/build/${checksum_file}?job=mxe_gcc5" +#last_checksum_d="https://gitlab.com/${CI_PROJECT_PATH}/-/jobs/artifacts/master/raw/build/debug-${checksum_file}?job=mxe_gcc5" # not handled yet # end of variable-scrabble (move this to gitlab-ci.yml laterâ„¢) -- cgit v1.2.3-60-g2f50