diff options
author | Andrei Karas <akaras@inbox.ru> | 2018-06-18 01:07:26 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2018-06-18 01:07:26 +0300 |
commit | 5e11fb3595e752e37557e3e1a1a0590e033daad3 (patch) | |
tree | c0f009ae5e0721352c2b3ca754fc9912a981d942 /tools | |
parent | 6057e8d87c5716caaff856d17c2cf61fbd5dcfcf (diff) | |
download | manaplus-5e11fb3595e752e37557e3e1a1a0590e033daad3.tar.gz manaplus-5e11fb3595e752e37557e3e1a1a0590e033daad3.tar.bz2 manaplus-5e11fb3595e752e37557e3e1a1a0590e033daad3.tar.xz manaplus-5e11fb3595e752e37557e3e1a1a0590e033daad3.zip |
Fix stats site compilation.
Also add build date/time into commit version file.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/ci/branches/ci_site/.gitlab-ci.yml | 11 | ||||
-rwxr-xr-x | tools/ci/jobs/pages.sh | 3 |
2 files changed, 13 insertions, 1 deletions
diff --git a/tools/ci/branches/ci_site/.gitlab-ci.yml b/tools/ci/branches/ci_site/.gitlab-ci.yml index b422f9587..fa4ca6523 100644 --- a/tools/ci/branches/ci_site/.gitlab-ci.yml +++ b/tools/ci/branches/ci_site/.gitlab-ci.yml @@ -2,6 +2,17 @@ stages: - build - stats +# with :; prevent from run it on windows +before_script: + - ":; uname -a" + - ":; cat /etc/os-release" + - ":; pwd" + - ":; cat /proc/sys/kernel/core_pattern" + - ":; mkdir logs || true" + - ":; ${UPDATEREPOS}" + - ":; ${DOCKERRETRY} ${PMUPDATE} >logs/apt.log" + - ":; ${DOCKERRETRY} ${PMINSTALL} ${PACKAGES} >>logs/apt.log" + .job-push: &job-push artifacts: paths: diff --git a/tools/ci/jobs/pages.sh b/tools/ci/jobs/pages.sh index b710483b3..720a3f917 100755 --- a/tools/ci/jobs/pages.sh +++ b/tools/ci/jobs/pages.sh @@ -13,7 +13,8 @@ mkdir -p ../public/version cp ./logs/gcc-?.* ../public/gcov || exit 1 cp ./logs/gcc-?_SDL2.* ../public/gcov || exit 1 -echo "Url: $CI_PROJECT_URL" >../public/version/commit.txt +echo date >../public/version/commit.txt +echo "Url: $CI_PROJECT_URL" >>../public/version/commit.txt echo "Ref name: $CI_BUILD_REF_NAME" >>../public/version/commit.txt echo "Ref: $CI_BUILD_REF" >>../public/version/commit.txt |