From 04725e7f7a6e61fd18e09fa0987bde8d8871d6b0 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@fossgalaxy.com>
Date: Sun, 5 Dec 2021 14:37:28 +0000
Subject: [PATCH] Update .gitlab-ci.yml - make use of prebuilt cmake image.
---
.gitlab-ci.yml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b4a3a26..7302018 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,10 +30,11 @@ stages: # List of stages for jobs, and their order of execution
# - make
.f34-ogl:
- image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/fedora:34
+ image: git.fossgalaxy.com:8042/gamedev/containers:f34-cmake
before_script:
- - dnf install -y cmake extra-cmake-modules glew-devel glm-devel
+ - dnf install -y glew-devel glm-devel
+# Use glfw-wayland from fedora repostory
build:f34-repo-wayland:
extends: .f34-ogl
stage: build
@@ -47,6 +48,7 @@ build:f34-repo-wayland:
- build/fggl/
- build/tests/
+# use vendored glfw
build:f34-fallback-wayland:
extends: .f34-ogl
stage: build
--
GitLab