From 4ba8d1da0e122f36c54eeadb334ed97df4d6a1f2 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Thu, 21 Apr 2022 18:54:34 +0100
Subject: [PATCH] add debian-based build
---
.gitlab-ci.yml | 32 ++++++++------------------------
1 file changed, 8 insertions(+), 24 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28916ea..bf46ccc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,7 +27,7 @@ stages: # List of stages for jobs, and their order of execution
- dnf install -y libxcb-devel libfontenc-devel libXaw-devel libXcomposite-devel libXcursor-devel libXdmcp-devel libXft-devel libXtst-devel libXinerama-devel libxkbfile-devel libXrandr-devel libXres-devel libXScrnSaver-devel libXvMC-devel xorg-x11-xtrans-devel xcb-util-wm-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel libXdamage-devel libXxf86vm-devel libXv-devel xkeyboard-config-devel xcb-util-devel libuuid-devel
- pip install conan
-build:f34-conan-xorg:
+build:fedora:
extends: .f34-ogl
stage: build
script:
@@ -36,29 +36,13 @@ build:f34-conan-xorg:
artifacts:
paths:
- build/fggl/
- - build/tests/
-test:f34-fallback-wayland:
- extends: .f34-ogl
- stage: test
- needs: [ "build:f34-conan-xorg" ]
+build:debian:
+ image: debian:stable
+ before_script:
+ - apt update && apt install -y build-essential python3
+ - pip install conan
script:
- - cd build && ./tests/testfggl/fggl_test
- dependencies:
- - build:f34-conan-xorg
-
-#unit-test-job: # This job runs in the test stage.
-# stage: test # It only starts when the job in the build stage completes successfully.
-# before_script:
-# - apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl wayland-dev wayland-protocols
-# script:
-# - mkdir build && cd build
-# - cmake .. && make # TODO cache build from previous step
-# - ./tests/testfggl/fggl_test
+ - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
+ - cmake --build build
-#lint-test-job: # This job also runs in the test stage.
-# stage: test # It can run at the same time as unit-test-job (in parallel).
-# script:
-# - echo "Linting code... This will take about 10 seconds."
-# - sleep 10
-# - echo "No lint issues found."
--
GitLab