Skip to content
Snippets Groups Projects
Commit 0672fad6 authored by Joseph Walton-Rivers's avatar Joseph Walton-Rivers
Browse files

add builds for both glfw from repo and fallback

parent ed9d3a7c
No related branches found
No related tags found
No related merge requests found
Pipeline #3009 failed
......@@ -29,15 +29,16 @@ stages: # List of stages for jobs, and their order of execution
# - cmake ..
# - make
.fedora-wayland:
.f34-ogl:
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/fedora:34
before_script:
- dnf install -y cmake wayland-devel libxkbcommon-devel wayland-protocols-devel extra-cmake-modules glew-devel glm-devel
- dnf install -y cmake extra-cmake-modules glew-devel glm-devel
build:fedora-wayland:
extends: .fedora-wayland
build:f34-repo-wayland:
extends: .f34-ogl
stage: build
script:
- dnf install -y glfw-devel
- mkdir build && cd build
- cmake ..
- make
......@@ -45,15 +46,27 @@ build:fedora-wayland:
paths:
- build/fggl/
- build/tests/
- build/demos/
test:fedora-wayland:
extends: .fedora-wayland
build:f34-fallback-wayland:
extends: .f34-ogl
stage: build
script:
- dnf install -y wayland-devel wayland-protocols-devel libxkbcommon-devel
- mkdir build && cd build
- cmake ..
- make
artifacts:
paths:
- build/fggl/
- build/tests/
test:f34-fallback-wayland:
extends: .f34-ogl
stage: test
script:
- cd build && ./tests/testfggl/fggl_test
dependencies:
- build:fedora-wayland
- build:f34-fallback-wayland
#unit-test-job: # This job runs in the test stage.
# stage: test # It only starts when the job in the build stage completes successfully.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment