From 3e541f210156206265e37863b5251fda51bdc5f5 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@fossgalaxy.com>
Date: Sun, 5 Dec 2021 15:42:46 +0000
Subject: [PATCH] Update .gitlab-ci.yml, make use of new container images.
---
.gitlab-ci.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7302018..374505b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,9 +30,7 @@ stages: # List of stages for jobs, and their order of execution
# - make
.f34-ogl:
- image: git.fossgalaxy.com:8042/gamedev/containers:f34-cmake
- before_script:
- - dnf install -y glew-devel glm-devel
+ image: git.fossgalaxy.com:8042/gamedev/containers/fedora:34-opengl
# Use glfw-wayland from fedora repostory
build:f34-repo-wayland:
@@ -65,6 +63,7 @@ build:f34-fallback-wayland:
test:f34-fallback-wayland:
extends: .f34-ogl
stage: test
+ needs: [ "build:f34-fallback-wayland" ]
script:
- cd build && ./tests/testfggl/fggl_test
dependencies:
--
GitLab