diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa519ad2dcf19fece7529c37a816edd478e40a15..09bae7f564bfc7faff0b5fd96b824292d401e272 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