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

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
parent 5859bc12
No related branches found
No related tags found
No related merge requests found
Pipeline #3006 passed
...@@ -20,23 +20,33 @@ stages: # List of stages for jobs, and their order of execution ...@@ -20,23 +20,33 @@ stages: # List of stages for jobs, and their order of execution
- test - test
- deploy - 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 stage: build
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/fedora:34
before_script: 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: script:
- mkdir build && cd build - mkdir build && cd build
- cmake .. - cmake ..
- make - make
unit-test-job: # This job runs in the test stage. #unit-test-job: # This job runs in the test stage.
stage: test # It only starts when the job in the build stage completes successfully. # stage: test # It only starts when the job in the build stage completes successfully.
before_script: # before_script:
- apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl wayland-dev wayland-protocols # - apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl wayland-dev wayland-protocols
script: # script:
- mkdir build && cd build # - mkdir build && cd build
- cmake .. && make # TODO cache build from previous step # - cmake .. && make # TODO cache build from previous step
- ./tests/testfggl/fggl_test # - ./tests/testfggl/fggl_test
#lint-test-job: # This job also runs in the test stage. #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). # stage: test # It can run at the same time as unit-test-job (in parallel).
......
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