Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
Game Library
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Game Development
Game Library
Commits
0672fad6
Commit
0672fad6
authored
3 years ago
by
Joseph Walton-Rivers
Browse files
Options
Downloads
Patches
Plain Diff
add builds for both glfw from repo and fallback
parent
ed9d3a7c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#3009
failed
3 years ago
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+21
-8
21 additions, 8 deletions
.gitlab-ci.yml
with
21 additions
and
8 deletions
.gitlab-ci.yml
+
21
−
8
View file @
0672fad6
...
...
@@ -29,15 +29,16 @@ stages: # List of stages for jobs, and their order of execution
# - cmake ..
# - make
.f
edora-wayland
:
.f
34-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:f
edora
-wayland
:
extends
:
.f
edora-wayland
build:f
34-repo
-wayland
:
extends
:
.f
34-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:f
edora
-wayland
-
build:f
34-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.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment