Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
wenqing
ogs
Commits
7d940296
Verified
Commit
7d940296
authored
Jun 23, 2020
by
Lars Bilke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ci] Do not use Conan in Linux GUI build.
parent
d1fba71f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
ThirdParty/container-maker
ThirdParty/container-maker
+1
-1
scripts/ci/jobs/build-gui-linux.yml
scripts/ci/jobs/build-gui-linux.yml
+1
-4
scripts/ci/jobs/build_image.yml
scripts/ci/jobs/build_image.yml
+1
-1
No files found.
container-maker
@
3b69e7b9
Compare
e12696ff
...
3b69e7b9
Subproject commit
e12696ff7cf4ee03d94e34f6b9d3615f43befeb9
Subproject commit
3b69e7b92bae8a4c3f22ab170f46f0822128d0db
scripts/ci/jobs/build-gui-linux.yml
View file @
7d940296
...
...
@@ -17,10 +17,8 @@ build gui linux:
variables
:
BUILD_DIR
:
"
build-gui-linux"
CONAN_USER_HOME
:
"
$CI_PROJECT_DIR/.conan"
CMAKE_ARGS
:
>-
-DOGS_USE_CONAN=ON
-DOGS_USE_PCH=OFF
-DOGS_USE_CONAN=OFF
-DOGS_BUILD_GUI=ON
-DOGS_BUILD_UTILS=ON
-DOGS_USE_NETCDF=ON
...
...
@@ -31,4 +29,3 @@ build gui linux:
cache
:
paths
:
-
$CCACHE_DIR
-
$CONAN_USER_HOME
scripts/ci/jobs/build_image.yml
View file @
7d940296
...
...
@@ -21,7 +21,7 @@ build container images:
--tag $CONTAINER_GCC_IMAGE --upload
-
docker pull registry.opengeosys.org/ogs/ogs/ogs/gcc-gui:master ||
true
-
python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
--pm
conan
--cvode --cppcheck --docs --gcovr --gui
--pm
system
--cvode --cppcheck --docs --gcovr --gui
--tag $CONTAINER_GCC_GUI_IMAGE --upload
-
docker pull registry.opengeosys.org/ogs/ogs/ogs/clang:master ||
true
-
python ThirdParty/container-maker/ogscm/cli.py --build --ogs off
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment