Skip to content

Commit

Permalink
ff
Browse files Browse the repository at this point in the history
  • Loading branch information
ptitjano committed Apr 26, 2024
1 parent 8610867 commit 5e08ee6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 18 deletions.
10 changes: 0 additions & 10 deletions .gitlab/dockerfiles/Dockerfile.windows

This file was deleted.

11 changes: 3 additions & 8 deletions .gitlab/pipeline/build-windows.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
build:windows:
stage: build
tags:
- windows
- saas-windows-medium-amd64
rules:
# on default branch
- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
Expand All @@ -15,13 +15,8 @@ build:windows:
- Start-Service -Name "docker"
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
script:
- docker build
--pull
--cache-from $CI_REGISTRY_IMAGE:latest
--tag $CI_REGISTRY_IMAGE:windows_$CI_COMMIT_SHA
-f .gitlab\dockerfiles\Dockerfile.windows
.
- docker push $CI_REGISTRY_IMAGE:windows_$CI_COMMIT_SHA
- docker build --tag foo -f Dockerfile.windows .
- docker push foo
after_script:
- docker logout $CI_REGISTRY

Expand Down
20 changes: 20 additions & 0 deletions Dockerfile.windows
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
FROM mcr.microsoft.com/windows/servercore:ltsc2022

SHELL ["powershell", "-Command"]

# download and install vs build tools needed by vcpkg
RUN Invoke-WebRequest "https://aka.ms/vs/17/release/vs_buildtools.exe" \
-OutFile "%TEMP%\vs_buildtools.exe" -UseBasicParsing
RUN "%TEMP%\vs_buildtools.exe" --quiet --wait --norestart --noUpdateInstaller \
--add Microsoft.VisualStudio.Workload.VCTools \
--includeRecommended

# install vcpkg
RUN $Env:VCPKG_INSTALL_DIR = "c:\\vcpkg"
RUN git clone https://github.com/microsoft/vcpkg $Env:VCPKG_INSTALL_DIR && \
cd $Env:VCPKG_INSTALL_DIR && \
bootstrap-vcpkg.bat
RUN vcpkg install cgal boost-program-options boost-timer boost-test

# build sfcgal
- cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DSFCGAL_BUILD_TESTS=OFF -DCMAKE_TOOLCHAIN_FILE="$Env:VCPKG_INSTALL_DIR\scripts\buildsystems\vcpkg.cmake"

0 comments on commit 5e08ee6

Please sign in to comment.