fix
This commit is contained in:
parent
c65c5c8c5a
commit
5ae0652661
1 changed files with 13 additions and 13 deletions
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
ubuntu2004-ninja-gcc:
|
ubuntu2004-ninja-gcc:
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null
|
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_LINUX == null
|
||||||
variables:
|
variables:
|
||||||
CMAKE_GENERATOR: Ninja
|
CMAKE_GENERATOR: Ninja
|
||||||
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON
|
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON
|
||||||
|
|
@ -18,18 +18,18 @@ ubuntu2004-ninja-gcc:
|
||||||
# Nightly
|
# Nightly
|
||||||
#################################################
|
#################################################
|
||||||
|
|
||||||
# ubuntu2004-makefile-gcc:
|
ubuntu2004-makefile-gcc:
|
||||||
# rules:
|
rules:
|
||||||
# - !reference [.rules-merge-request-manual, rules]
|
- !reference [.rules-merge-request-manual, rules]
|
||||||
# - if: $NIGHTLY_MASTER
|
- if: $NIGHTLY_MASTER
|
||||||
# variables:
|
variables:
|
||||||
# CMAKE_GENERATOR: Unix Makefiles
|
CMAKE_GENERATOR: Unix Makefiles
|
||||||
# CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON
|
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON
|
||||||
# CC: gcc
|
CC: gcc
|
||||||
# CXX: g++
|
CXX: g++
|
||||||
# ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
|
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
|
||||||
# extends: .linux-desktop
|
extends: .linux-desktop
|
||||||
# <<: *docker_image_platform_and_runner_tag
|
<<: *docker_image_platform_and_runner_tag
|
||||||
|
|
||||||
ubuntu2004-ninja-clang:
|
ubuntu2004-ninja-clang:
|
||||||
rules:
|
rules:
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue