Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ci/gitlab/normal.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
variables:
ALMA_LATEST_IMAGE: "gitlab-registry.cern.ch/quasar-team/images/alma-10-build:latest"
WINDOWS_LATEST_IMAGE: "gitlab-registry.cern.ch/quasar-team/images/win2025-build:latest"

Compile on Windows:
stage: unstagged
image: $CI_REGISTRY_IMAGE/win2022-build:latest
image: $WINDOWS_LATEST_IMAGE
tags:
- win2022-container
- win2025-container
script:
- cmake -B build
- cmake --build build --config Release
Expand All @@ -27,9 +28,9 @@ Compile on Linux:

Google Tests on Windows:
stage: unstagged
image: $CI_REGISTRY_IMAGE/win2022-build:latest
image: $WINDOWS_LATEST_IMAGE
tags:
- win2022-container
- win2025-container
needs:
- Compile on Windows
script:
Expand All @@ -45,9 +46,9 @@ Google Tests on Linux:

Pytest on Windows:
stage: unstagged
image: $CI_REGISTRY_IMAGE/win2022-build:latest
image: $WINDOWS_LATEST_IMAGE
tags:
- win2022-container
- win2025-container
needs:
- Compile on Windows
script:
Expand Down
1 change: 1 addition & 0 deletions test/cpp/LogIt_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <gtest/gtest.h>

#include <chrono>
#include <string>
#include <thread> // NOLINT

Expand Down