Commit 6e54f189 authored by Aron Helser's avatar Aron Helser Committed by Kitware Robot
Browse files

Merge topic 'ci_settings'

08baaade CI settings - tell QT windows to do desktop
bab6b620

 CI settings - install crun for podman
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !710
parents 5acabec3 08baaade
......@@ -34,7 +34,7 @@ readonly image_tag_latest="ci-aeva-$ci_image_tag-latest"
readonly docker="podman --storage-driver=vfs"
# Install the tools we'll need.
dnf install -y git-core podman-docker
dnf install -y git-core podman-docker crun
# Clone AEVA for its image scripts.
[ -d ".aeva" ] || git clone --depth 1 https://gitlab.kitware.com/aeva/aeva.git -b "$aeva_tag" .aeva
# Pull the existing image (if available).
......
......@@ -34,7 +34,7 @@ readonly image_tag_latest="ci-aevasession-$ci_image_tag-latest"
readonly docker="podman --storage-driver=vfs"
# Install the tools we'll need.
dnf install -y git-core podman-docker
dnf install -y git-core podman-docker crun
# Clone AEVA-session for its image scripts.
[ -d ".aevasession" ] || git clone --depth 1 https://gitlab.kitware.com/aeva/session.git -b "$aevasession_tag" .aevasession
# Pull the existing image (if available).
......
......@@ -19,6 +19,9 @@
# Even if we could, it could change if other runners on the machine
# could run at the same time, so we drop it.
GIT_CLONE_PATH: "$CI_BUILDS_DIR\\cmb-ci"
# Force "desktop" OpenGL support. Qt seems to want to use EGL when run
# from GitLab-CI by default (it runs as a Windows service).
QT_OPENGL: desktop
.windows_vs2019:
extends: .windows_build
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment