Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
linphone-desktop
Commits
5ae06526
Commit
5ae06526
authored
4 weeks ago
by
Gaëlle Braud
Browse files
Options
Download
Patches
Plain Diff
fix
parent
c65c5c8c
master
feature/translation
release/6.0
1 merge request
!1360
update sdk
Pipeline
#91486
failed
Changes
1
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
+13
-13
.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
with
13 additions
and
13 deletions
.gitlab-ci-files/linux-desktop-ubuntu-2004.yml
+
13
−
13
View file @
5ae06526
...
...
@@ -4,7 +4,7 @@
ubuntu2004-ninja-gcc
:
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
:
CMAKE_GENERATOR
:
Ninja
CMAKE_OPTIONS
:
-DENABLE_PQCRYPTO=ON
...
...
@@ -18,18 +18,18 @@ ubuntu2004-ninja-gcc:
# Nightly
#################################################
#
ubuntu2004-makefile-gcc:
#
rules:
#
- !reference [.rules-merge-request-manual, rules]
#
- if: $NIGHTLY_MASTER
#
variables:
#
CMAKE_GENERATOR: Unix Makefiles
#
CMAKE_OPTIONS: -DENABLE_PQCRYPTO=ON
#
CC: gcc
#
CXX: g++
#
ADDITIONAL_BUILD_OPTIONS: -j$MAKEFILE_JOBS
#
extends: .linux-desktop
#
<<: *docker_image_platform_and_runner_tag
ubuntu2004-makefile-gcc
:
rules
:
-
!reference
[
.rules-merge-request-manual
,
rules
]
-
if
:
$NIGHTLY_MASTER
variables
:
CMAKE_GENERATOR
:
Unix Makefiles
CMAKE_OPTIONS
:
-DENABLE_PQCRYPTO=ON
CC
:
gcc
CXX
:
g++
ADDITIONAL_BUILD_OPTIONS
:
-j$MAKEFILE_JOBS
extends
:
.linux-desktop
<<
:
*docker_image_platform_and_runner_tag
ubuntu2004-ninja-clang
:
rules
:
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
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
Menu
Explore
Projects
Groups
Topics
Snippets