|
|
commit 0c539b784d2f42a32c8999246f2184d5cd913830
Author: Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Mon Sep 7 15:00:38 2020 +0200
Commit: Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Mon Sep 7 15:00:38 2020 +0200
Fine tune GitLab-CI script
Also: update documentation copyright year.
.gitlab-ci.yml | 23 ++++++++++++++++++-----
documentation/src/html_footer | 4 ++--
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git .gitlab-ci.yml .gitlab-ci.yml
index eb52572..481ee53 100644
--- .gitlab-ci.yml
+++ .gitlab-ci.yml
@@ -2,15 +2,12 @@
#
# 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.
#
# The documentation will be viewable at:
#
-# https://fltk.gitlab.io/<repository>/
-#
-# <repository> can be:
-# - fltk
+# https://fltk.gitlab.io/fltk/
#
# Details of this script:
#
@@ -56,16 +53,23 @@ build-autotools:
build-cmake:
stage: build
+ only:
+ - master
# install the necessary build tools
before_script:
+ - date
- apt update && apt -y install cmake ninja-build
- apt -y install freeglut3-dev libfontconfig-dev libxft-dev libglew-dev
- apt -y install libxcursor-dev libxinerama-dev libasound2-dev
- apt -y install libpango1.0-dev libcairo2-dev
script:
+ - date
+ - gcc --version
- mkdir build && cd build
- cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DFLTK_BUILD_EXAMPLES=ON -DOPTION_USE_PANGO=ON -DOPTION_CAIRO=ON ..
+ - date
- time ninja
+ - date
artifacts:
paths:
- build/lib/
@@ -75,16 +79,25 @@ build-cmake:
pages:
stage: deploy
+ only:
+ - master
+ # run this job (documentation) independent of the build jobs (empty "needs" clause)
+ needs: []
# install the necessary build tools
before_script:
+ - date
- apt update && apt -y install make autoconf man doxygen
script:
+ - date
- make clean
- cd documentation
+ - date
- make && make html
+ - date
- cd ..
- mkdir -p public/
- mv documentation/html/* public/
+ - date
artifacts:
paths:
- public
diff --git documentation/src/html_footer documentation/src/html_footer
index 4d60ab3..0ae62b1 100644
--- documentation/src/html_footer
+++ documentation/src/html_footer
@@ -1,7 +1,7 @@
<!--BEGIN GENERATE_TREEVIEW-->
<li class="footer">
<!-- Generated for $projectname by Doxygen -->
- © 1998-2018 by Bill Spitzak and others.
+ © 1998-2020 by Bill Spitzak and others.
<a href="https://www.fltk.org"><img src="tiny.png" align="bottom" alt="FLTK"></a>
</li>
</ul>
@@ -10,7 +10,7 @@
<!--BEGIN !GENERATE_TREEVIEW-->
<hr class="footer"/><address class="footer"><small>
<!-- Generated for $projectname by Doxygen -->
- © 1998-2018 by Bill Spitzak and others.
+ © 1998-2020 by Bill Spitzak and others.
<a href="https://www.fltk.org"><img src="tiny.png" align="bottom" alt="FLTK"></a>
</small></address>
<hr class="footer"/><address class="footer"><small>
[ Direct Link to Message ] | |
|
| |