From 35e260f482aef93fbae8a551eca7b8c3183e0a08 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@walton-rivers.uk>
Date: Sun, 19 Jun 2022 17:54:22 +0100
Subject: [PATCH] update ubuntu/debian build instructions based on
ubuntu-server
---
.gitlab-ci.yml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 633b3ca..767abbb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,14 +37,13 @@ build:fedora:
paths:
- build/fggl/
-build:debian:
- image: debian:stable
+build:ubuntu:
+ image: ubuntu:jammy
stage: build
before_script:
- - apt update && apt install -y build-essential python3-pip cmake pkg-config
- - apt install -y libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxft-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util0-dev
- - apt install -y libgl-dev mesa-utils libglu1-mesa-dev mesa-common-dev
- - pip install conan
+ - apt update && apt install -y build-essential cmake
+ - add-apt-repository -y universe
+ - apt install -y libglm-dev libglfw3-dev libopenal-dev libspdlog-dev libfreetype-dev libyaml-cpp-dev libassimp-dev libbullet-dev
script:
- cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
- cmake --build build
--
GitLab