From 0672fad6a8dec906b02f1778f0492f617365ed07 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <webpigeon@fossgalaxy.com>
Date: Tue, 17 Aug 2021 23:52:12 +0100
Subject: [PATCH] add builds for both glfw from repo and fallback
---
.gitlab-ci.yml | 29 +++++++++++++++++++++--------
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a43b33..b4a3a26 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,15 +29,16 @@ stages: # List of stages for jobs, and their order of execution
# - cmake ..
# - make
-.fedora-wayland:
+.f34-ogl:
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/fedora:34
before_script:
- - dnf install -y cmake wayland-devel libxkbcommon-devel wayland-protocols-devel extra-cmake-modules glew-devel glm-devel
+ - dnf install -y cmake extra-cmake-modules glew-devel glm-devel
-build:fedora-wayland:
- extends: .fedora-wayland
+build:f34-repo-wayland:
+ extends: .f34-ogl
stage: build
script:
+ - dnf install -y glfw-devel
- mkdir build && cd build
- cmake ..
- make
@@ -45,15 +46,27 @@ build:fedora-wayland:
paths:
- build/fggl/
- build/tests/
- - build/demos/
-test:fedora-wayland:
- extends: .fedora-wayland
+build:f34-fallback-wayland:
+ extends: .f34-ogl
+ stage: build
+ script:
+ - dnf install -y wayland-devel wayland-protocols-devel libxkbcommon-devel
+ - mkdir build && cd build
+ - cmake ..
+ - make
+ artifacts:
+ paths:
+ - build/fggl/
+ - build/tests/
+
+test:f34-fallback-wayland:
+ extends: .f34-ogl
stage: test
script:
- cd build && ./tests/testfggl/fggl_test
dependencies:
- - build:fedora-wayland
+ - build:f34-fallback-wayland
#unit-test-job: # This job runs in the test stage.
# stage: test # It only starts when the job in the build stage completes successfully.
--
GitLab