From 08dee7fa3cc5d19f46adf21e2c38944421788de5 Mon Sep 17 00:00:00 2001 From: Martin Heistermann <git@mheistermann.de> Date: Sun, 16 Feb 2025 14:45:49 +0100 Subject: [PATCH] split component into separate project: https://gitlab.inf.unibe.ch/CGG-public/ci-components/windows --- CMakeLists.txt | 4 -- README.md | 2 + templates/vs22-cmake.yml | 98 ---------------------------------------- test.cc | 6 --- 4 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 CMakeLists.txt delete mode 100644 templates/vs22-cmake.yml delete mode 100644 test.cc diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 87a2952..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -project(Test) - -add_executable(test test.cc) - diff --git a/README.md b/README.md index 53b13cc..c84585f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # BuildBox-Windows (experimental) +Use with https://gitlab.inf.unibe.ch/CGG-public/ci-components/windows CI component. + ## Containers - VS 2022 based on servercore:ltsc2022 container diff --git a/templates/vs22-cmake.yml b/templates/vs22-cmake.yml deleted file mode 100644 index 6b74a6f..0000000 --- a/templates/vs22-cmake.yml +++ /dev/null @@ -1,98 +0,0 @@ -spec: - inputs: - stage: - 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 ---- - -.job-template-windows: - stage: $[[ inputs.stage ]] - #image: $CI_REGISTRY_IMAGE:windows-vs17-rel-latest - image: gitlab.inf.unibe.ch:5001/cgg-public/containers/buildbox-windows:x64-vs2022-latest - variables: - CL_NAME: "cl" - 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: cl - TOOLSET: "v143" - before_script: - # -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' - - 'md ${Env:CHOCO_CACHE} -ea 0 -Force' - - '$buildDir="build-${Env:CI_JOB_NAME}"' - - 'mkdir $buildDir > $null' - - 'ccache -s -v' - - 'cd $buildDir' - artifacts: - when: always - reports: - junit: build-${CI_JOB_NAME}/test-report-${BUILD_TYPE}.xml - - - -.job-template-windows-msbuild: - extends: .job-template-windows - script: - - '$cmakeGenerator="Visual Studio 17 2022"' - - 'echo "Toolset: ${Env:TOOLSET}"' - - > - cmake -G "${cmakeGenerator}" .. - -T "${Env:TOOLSET}" - -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 . - --config "${Env:BUILD_TYPE}" - -- - /nologo - /verbosity:minimal - /maxcpucount - /p:TrackFileAccess=false - #/p:CLToolExe=ccache.exe - - 'if(!$?) { throw "build failed" }' - - 'ctest --output-junit test-report-${Env:BUILD_TYPE}.xml' - - 'if(!$?) { throw "tests failed" }' - - -.job-template-windows-ninja: - extends: .job-template-windows - script: - - > - cmake -G Ninja .. - -DCMAKE_BUILD_TYPE="${Env:BUILD_TYPE}" - -DCMAKE_TOOLCHAIN_FILE=C:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache - -DCOMISO_ENABLE_METIS=OFF - - - 'if(!$?) { throw "cmake failed" }' - - 'cmake --build .' - - 'if(!$?) { throw "build failed" }' - - 'ctest --output-junit test-report-${Env:BUILD_TYPE}.xml' - - 'if(!$?) { throw "tests failed" }' - - 'ccache -s' - - -"$[[ inputs.job-name ]]": - extends: - - .job-template-windows-ninja - variables: - BUILD_TYPE: Release - diff --git a/test.cc b/test.cc deleted file mode 100644 index fd019bc..0000000 --- a/test.cc +++ /dev/null @@ -1,6 +0,0 @@ -#include <iostream> -int main(int argc, char *argv[]) -{ - std::cout << "Hello." << std::endl; - return 0; -} -- GitLab