From 2251c814b5b8671d06ee4818f9dd975a307eeda2 Mon Sep 17 00:00:00 2001
From: Martin Heistermann <git@mheistermann.de>
Date: Sat, 15 Feb 2025 19:18:28 +0100
Subject: [PATCH] wip
---
.gitlab-ci.yml | 5 ++---
templates/vs22-cmake.yml | 17 ++++++-----------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 28a1f21..0b9f3f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,10 +86,9 @@ ensure-job-added:
- |
route="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/jobs"
echo "$route"
- curl --silent "$route" | jq '.'
- count=`curl --silent "$route" | jq 'map(select(.name | contains("component job of vs22-x64"))) | length'`
+ count=`curl --silent "$route" | jq 'map(select(.name | contains("vs22-x64"))) | length'`
if [ "$count" != "1" ]; then
- echo "Count $count"
+ curl --silent "$route" | jq '.'
exit 1; else
echo "Component Job present"
fi
diff --git a/templates/vs22-cmake.yml b/templates/vs22-cmake.yml
index 9517dcb..6b74a6f 100644
--- a/templates/vs22-cmake.yml
+++ b/templates/vs22-cmake.yml
@@ -4,20 +4,17 @@ spec:
default: test
BUILD_TYPE:
default: Release
+ TOOLSET:
+ default: v143
tags:
default: []
type: array
+ cmake_options:
+ default: ""
job-name:
description: "The job's name"
default: vs22-x64
---
-component-job:
- stage: $[[ inputs.stage ]]
- tags: $[[ inputs.tags ]]
- script: echo job 1
-
-
-
.job-template-windows:
stage: $[[ inputs.stage ]]
@@ -25,17 +22,14 @@ component-job:
image: gitlab.inf.unibe.ch:5001/cgg-public/containers/buildbox-windows:x64-vs2022-latest
variables:
CL_NAME: "cl"
- TOOLSET: "v143"
+ TOOLSET: "$[[ inputs.TOOLSET ]]"
VCPKG_ROOT: "C:/Tools/vcpkg/"
tags: $[[ inputs.tags ]]
variables:
BUILD_TYPE: Release # Debug currently fails with an internal LLVM error
- #CL_NAME: clang-cl
CL_NAME: cl
TOOLSET: "v143"
before_script:
- #- '&${Env:CLCACHE} -s'
- #- '${Env:CLCACHE_CL}=Get-Command "${ENV:CL_NAME}" | Select-Object -expand Source'
# -Force prevents an error if the directory already exists.
- 'md ${Env:VCPKG_DEFAULT_BINARY_CACHE} -ea 0 -Force'
- 'md ${Env:CCACHE_DIR} -ea 0 -Force'
@@ -62,6 +56,7 @@ component-job:
-A x64
-DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake
-DCOMISO_ENABLE_METIS=OFF
+ $[[ inputs.cmake_options ]]
- 'if(!$?) { throw "cmake failed" }'
- >
cmake --build .
--
GitLab