diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4a3a26a0911aecc2822d887464a1e52e12bb9e8..7302018a8c167ed76fa8f96a0ffa33a547f11d9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,10 +30,11 @@ stages: # List of stages for jobs, and their order of execution # - make .f34-ogl: - image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/fedora:34 + image: git.fossgalaxy.com:8042/gamedev/containers:f34-cmake before_script: - - dnf install -y cmake extra-cmake-modules glew-devel glm-devel + - dnf install -y glew-devel glm-devel +# Use glfw-wayland from fedora repostory build:f34-repo-wayland: extends: .f34-ogl stage: build @@ -47,6 +48,7 @@ build:f34-repo-wayland: - build/fggl/ - build/tests/ +# use vendored glfw build:f34-fallback-wayland: extends: .f34-ogl stage: build