diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4b7a1a8..9b26f235 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,17 +12,20 @@ job_linux: - "make -j3 && make ziprelease" - "API=sdl2 make -j3 && API=sdl2 make ziprelease" - "make docarchive" + - "echo $CI_JOB_ID > LINUX_JOB_ID" artifacts: paths: - "*.zip" - "grafx2*.tgz" + - "VERSION" + - "LINUX_JOB_ID" pages: stage: pages script: - "NOLUA=1 API=x11 make htmldoc" - "mkdir -p public/htmldoc && cp doc/html/* public/htmldoc/" - - "echo -e '\nGrafX2\n\n\n\n\n' > public/index.html" + - "./.gitlab-page.sh" - "cd public && tar xzf ../grafx2*doxygen.tgz" artifacts: paths: @@ -48,7 +51,9 @@ job_win32: - "WIN32CROSS=1 API=sdl2 make -j2" - "WIN32CROSS=1 API=sdl2 make ziprelease" - "WIN32CROSS=1 API=sdl2 make win32installer" + - "echo $CI_JOB_ID > WIN32_JOB_ID" artifacts: paths: - "*.zip" - "install/grafx2*.exe" + - "WIN32_JOB_ID" diff --git a/.gitlab-page.sh b/.gitlab-page.sh new file mode 100755 index 00000000..54745869 --- /dev/null +++ b/.gitlab-page.sh @@ -0,0 +1,39 @@ +#!/bin/sh +# (c) 2019 Thomas Bernard +# + +OUTFILE=public/index.html +VERSION=$(cat VERSION) +LINUX_JOB_ID=$(cat LINUX_JOB_ID) +WIN32_JOB_ID=$(cat WIN32_JOB_ID) + +# for debug: +echo "CI_JOB_URL=${CI_JOB_URL}" +echo "CI_PAGES_URL=${CI_PAGES_URL}" +echo "CI_PIPELINE_URL=${CI_PIPELINE_URL}" +echo "CI_PROJECT_URL=${CI_PROJECT_URL}" +echo "CI_PROJECT_NAMESPACE=${CI_PROJECT_NAMESPACE}" +echo "CI_PROJECT_NAME=${CI_PROJECT_NAME}" +echo "CI_PROJECT_PATH_SLUG=${CI_PROJECT_PATH_SLUG}" + +echo "" > ${OUTFILE} +echo "" >> ${OUTFILE} +echo "GrafX2" >> ${OUTFILE} +echo "" >> ${OUTFILE} +echo "

GrafX2 version ${VERSION}

" >> ${OUTFILE} +echo "" >> ${OUTFILE} +echo "" >> ${OUTFILE} +echo "" >> ${OUTFILE} + +echo ${VERSION} diff --git a/src/Makefile b/src/Makefile index 2b8fd93d..bb5779cb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -906,6 +906,7 @@ endif ../share/grafx2/gfx2def.ini $(SCRIPT_FILES) $(SKIN_FILES) \ ../share/grafx2/gfx2.gif ../share/grafx2/gfx2.png ../share/icons/grafx2.svg \ $(DOC_FILES) $(wildcard ../misc/*/*) $(FONT_FILES) + echo "$(VERSIONTAG)" > ../VERSION $(BIN) : $(OBJ) @test -d ../bin || $(MKDIR) ../bin