From d25fe748a92a03d913dffa04392c2a50d40ceb0b Mon Sep 17 00:00:00 2001
From: Joseph Walton-Rivers <webpigeon@fossgalaxy.com>
Date: Tue, 17 Aug 2021 22:42:48 +0100
Subject: [PATCH] This swaps the build from alpine to Fedora.
All my dev machines are fedora, so this is the most tested distro.
This is a squashed commit, resolving two issues:
- A typo in the yaml stage tag
- Trying to update rather than just install deps
d#on't bother update, just install deps
---
.gitlab-ci.yml | 30 ++++++++++++++++++++----------
1 file changed, 20 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 425a2fd..e62c9d4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,23 +20,33 @@ 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.
+#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
+
+build:
stage: build
+ image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/fedora:34
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
+ - dnf install -y cmake wayland-devel libxkbcommon-devel wayland-protocols-devel extra-cmake-modules glew-devel glm-devel
script:
- mkdir build && cd build
- cmake ..
- make
-unit-test-job: # This job runs in the test stage.
- stage: test # It only starts when the job in the build stage completes successfully.
- before_script:
- - apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl wayland-dev wayland-protocols
- script:
- - mkdir build && cd build
- - cmake .. && make # TODO cache build from previous step
- - ./tests/testfggl/fggl_test
+#unit-test-job: # This job runs in the test stage.
+# stage: test # It only starts when the job in the build stage completes successfully.
+# before_script:
+# - apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl wayland-dev wayland-protocols
+# script:
+# - mkdir build && cd build
+# - cmake .. && make # TODO cache build from previous step
+# - ./tests/testfggl/fggl_test
#lint-test-job: # This job also runs in the test stage.
# stage: test # It can run at the same time as unit-test-job (in parallel).
--
GitLab