From 64de307c45d44da3dab5ce6be39d282871c433d0 Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <joseph@fossgalaxy.com>
Date: Thu, 21 Apr 2022 11:30:47 +0000
Subject: [PATCH] Update .gitlab-ci.yml file - forgot to mark the groupinstall
step as -y
---
.gitlab-ci.yml | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa519ad..09bae7f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,39 +20,14 @@ stages: # List of stages for jobs, and their order of execution
- test
- deploy
-#build-job: # This job runs in the build stage, which runs first.
-# stage: build
-# before_script:
-# - apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl mesa-egl mesa-gles wayland-dev wayland-protocols libxkbcommon-dev
-# script:
-# - mkdir build && cd build
-# - cmake ..
-# - make
-
.f34-ogl:
image: git.fossgalaxy.com:8042/gamedev/containers/fedora:34-opengl
-# Use glfw-wayland from fedora repostory
-build:f34-repo-wayland:
- extends: .f34-ogl
- stage: build
- script:
- - dnf install -y glfw-devel spdlog-devel
- - pip install conan
- - mkdir build && cd build
- - cmake .. -DCMAKE_BUILD_TYPE=Debug
- - make
- artifacts:
- paths:
- - build/fggl/
- - build/tests/
-
-# use vendored glfw
build:f34-conan-xorg:
extends: .f34-ogl
stage: build
script:
- - dnf group install "Development Tools"
+ - dnf group install -y "Development Tools"
- dnf install -y pkgconfig\(dri\) pkgconfig\(glu\) pkgconfig\(x11\) pkgconfig\(xcursor\) pkgconfig\(xi\) pkgconfig\(xinerama\) pkgconfig\(xrandr\)
- dnf install -y libxcb-devel libfontenc-devel libXaw-devel libXcomposite-devel libXcursor-devel libXdmcp-devel libXft-devel libXtst-devel libXinerama-devel libxkbfile-devel libXrandr-devel libXres-devel libXScrnSaver-devel libXvMC-devel xorg-x11-xtrans-devel xcb-util-wm-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel libXdamage-devel libXxf86vm-devel libXv-devel xkeyboard-config-devel xcb-util-devel libuuid-devel
- pip install conan
--
GitLab