From a713c9957c0c8f0bfa034313a75e91c25a611c1a Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Wed, 12 Jul 2023 23:23:10 +0100
Subject: [PATCH] update OS versions for CI builds
---
.gitlab-ci.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cadff4..e42eaad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,8 +23,8 @@ stages:
variables:
GIT_SUBMODULE_STRATEGY: recursive
-.f34-ogl:
- image: git.fossgalaxy.com:8042/gamedev/containers/fedora:36-opengl
+.fedora-ogl:
+ image: git.fossgalaxy.com:8042/gamedev/containers/fedora:38-opengl
before_script:
- dnf install -y pkgconfig\(dri\) pkgconfig\(glu\) pkgconfig\(x11\) pkgconfig\(xcursor\) pkgconfig\(xi\) pkgconfig\(xinerama\) pkgconfig\(xrandr\) pkgconfig\(lua\) doxygen
- dnf install -y glm-devel glfw-devel openal-soft-devel spdlog-devel freetype-devel yaml-cpp-devel assimp-devel gtest-devel gmock-devel
@@ -33,7 +33,7 @@ variables:
# Build Targets check it builds on popular Linux Distributions
##
build:fedora:
- extends: .f34-ogl
+ extends: .fedora-ogl
stage: build
script:
- cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DFGGL_EXT_BULLET=OFF
@@ -43,7 +43,7 @@ build:fedora:
- build/fggl/
build:ubuntu:
- image: ubuntu:jammy
+ image: ubuntu:lunar
stage: build
before_script:
- apt update && apt install -y build-essential cmake
--
GitLab