summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2025-03-07 23:31:14 +0100
committerAlbrecht Schlosser <albrechts.fltk@online.de>2025-03-07 23:31:14 +0100
commit187eaa04414f27fdc3dc7c663aaf19cfbd4d3097 (patch)
tree4fcd9e305f096f0c591c548865c9a4bfe90a06ac
parent1186b4e255832ae322e4dd2778318ebcb4568204 (diff)
Update GitLab CI for FLTK 1.5.0
- remove autotools build (build-autotools) - build documentation with `cmake`, not `make` To do: build fluid docs
-rw-r--r--.gitlab-ci.yml41
1 files changed, 12 insertions, 29 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 899fb0ccf..f19f808da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,27 +25,6 @@ stages:
- build
- deploy
-# Build with autoconf/make (including Pango and Cairo)
-
-# Disabled for regular builds after commits to save build time: "only schedules"
-# Note: Build time limits on "GitLab Free" effective Oct 2020: 400 minutes per month
-
-build-autotools:
- stage: build
- only:
- - schedules
- # install the necessary build tools
- before_script:
- - apt update && apt -y install make autoconf man
- - 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:
- - make clean
- - ./configure --enable-pango --enable-cairo
- - time make -j3
- - cd examples && time make
-
# Build with CMake and Ninja (with pango, cairo, building examples)
build-cmake:
@@ -79,20 +58,24 @@ pages:
# install the necessary build tools
before_script:
- date
- - apt update && apt -y install make autoconf man doxygen doxygen-latex
+ - apt update && apt -y install cmake ninja-build man doxygen-latex
+ - 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
- - make clean
- - cd documentation
- - date
- - make && make html
+ - pwd
+ - mkdir build && cd build
+ - cmake -G Ninja -D CMAKE_BUILD_TYPE=Debug -D FLTK_BUILD_TEST=OFF -D FLTK_USE_PANGO=ON -D FLTK_OPTION_CAIRO_WINDOW=ON ..
- date
- - make pdf
+ - time ninja html
+ - time ninja pdf
- date
- cd ..
+ - pwd
- mkdir -p public/
- - mv documentation/html/* public/
- - mv documentation/fltk.pdf public/
+ - mv build/documentation/html/* public/
+ - mv build/documentation/fltk.pdf public/
- date
artifacts:
paths: