Fine tune GitLab-CI script

Also: update documentation copyright year.
This commit is contained in:
Albrecht Schlosser 2020-09-07 15:00:38 +02:00
parent 0696bbe422
commit 0c539b784d
2 changed files with 20 additions and 7 deletions

View File

@ -2,15 +2,12 @@
# #
# It serves two purposes: # It serves two purposes:
# #
# (1) Continuously building FLTK with several build systems. # (1) Continuously building FLTK with one or more build systems.
# (2) Generating current HTML documentation and putting it online. # (2) Generating current HTML documentation and putting it online.
# #
# The documentation will be viewable at: # The documentation will be viewable at:
# #
# https://fltk.gitlab.io/<repository>/ # https://fltk.gitlab.io/fltk/
#
# <repository> can be:
# - fltk
# #
# Details of this script: # Details of this script:
# #
@ -56,16 +53,23 @@ build-autotools:
build-cmake: build-cmake:
stage: build stage: build
only:
- master
# install the necessary build tools # install the necessary build tools
before_script: before_script:
- date
- apt update && apt -y install cmake ninja-build - apt update && apt -y install cmake ninja-build
- apt -y install freeglut3-dev libfontconfig-dev libxft-dev libglew-dev - apt -y install freeglut3-dev libfontconfig-dev libxft-dev libglew-dev
- apt -y install libxcursor-dev libxinerama-dev libasound2-dev - apt -y install libxcursor-dev libxinerama-dev libasound2-dev
- apt -y install libpango1.0-dev libcairo2-dev - apt -y install libpango1.0-dev libcairo2-dev
script: script:
- date
- gcc --version
- mkdir build && cd build - mkdir build && cd build
- cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DFLTK_BUILD_EXAMPLES=ON -DOPTION_USE_PANGO=ON -DOPTION_CAIRO=ON .. - cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DFLTK_BUILD_EXAMPLES=ON -DOPTION_USE_PANGO=ON -DOPTION_CAIRO=ON ..
- date
- time ninja - time ninja
- date
artifacts: artifacts:
paths: paths:
- build/lib/ - build/lib/
@ -75,16 +79,25 @@ build-cmake:
pages: pages:
stage: deploy stage: deploy
only:
- master
# run this job (documentation) independent of the build jobs (empty "needs" clause)
needs: []
# install the necessary build tools # install the necessary build tools
before_script: before_script:
- date
- apt update && apt -y install make autoconf man doxygen - apt update && apt -y install make autoconf man doxygen
script: script:
- date
- make clean - make clean
- cd documentation - cd documentation
- date
- make && make html - make && make html
- date
- cd .. - cd ..
- mkdir -p public/ - mkdir -p public/
- mv documentation/html/* public/ - mv documentation/html/* public/
- date
artifacts: artifacts:
paths: paths:
- public - public

View File

@ -1,7 +1,7 @@
<!--BEGIN GENERATE_TREEVIEW--> <!--BEGIN GENERATE_TREEVIEW-->
<li class="footer"> <li class="footer">
<!-- Generated for $projectname by Doxygen --> <!-- Generated for $projectname by Doxygen -->
&copy; 1998-2018 by Bill Spitzak and others. &nbsp;&nbsp;&nbsp; &copy; 1998-2020 by Bill Spitzak and others. &nbsp;&nbsp;&nbsp;
<a href="https://www.fltk.org"><img src="tiny.png" align="bottom" alt="FLTK"></a> <a href="https://www.fltk.org"><img src="tiny.png" align="bottom" alt="FLTK"></a>
</li> </li>
</ul> </ul>
@ -10,7 +10,7 @@
<!--BEGIN !GENERATE_TREEVIEW--> <!--BEGIN !GENERATE_TREEVIEW-->
<hr class="footer"/><address class="footer"><small> <hr class="footer"/><address class="footer"><small>
<!-- Generated for $projectname by Doxygen --> <!-- Generated for $projectname by Doxygen -->
&copy; 1998-2018 by Bill Spitzak and others. &nbsp;&nbsp;&nbsp; &copy; 1998-2020 by Bill Spitzak and others. &nbsp;&nbsp;&nbsp;
<a href="https://www.fltk.org"><img src="tiny.png" align="bottom" alt="FLTK"></a> <a href="https://www.fltk.org"><img src="tiny.png" align="bottom" alt="FLTK"></a>
</small></address> </small></address>
<hr class="footer"/><address class="footer"><small> <hr class="footer"/><address class="footer"><small>