Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/timw/update-windows-ci'

Browse source 
* origin/topic/timw/update-windows-ci:
  Update libunistd submodule [nomail]
  Update Windows CI image to Visual Studio 2022
This commit is contained in:
Tim Wojtulewicz 2025-06-02 14:52:44 -07:00
commit f76a2437cd
6 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,3 +1,9 @@
8.0.0-dev.335 | 2025-06-02 14:52:44 -0700
* Update libunistd submodule [nomail] (Tim Wojtulewicz, Corelight)
* Update Windows CI image to Visual Studio 2022 (Tim Wojtulewicz, Corelight)
8.0.0-dev.332 | 2025-06-02 14:31:29 -0700 8.0.0-dev.332 | 2025-06-02 14:31:29 -0700
* CI: Force rebuild of opensuse tumbleweed docker image (Tim Wojtulewicz, Corelight) * CI: Force rebuild of opensuse tumbleweed docker image (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.332 8.0.0-dev.335

2
auxil/libunistd

@ -1 +1 @@
Subproject commit d2bfec929540c1fec5d1d45f0bcee3cff1eb7fa5 Subproject commit 27f17e1601123583272aa7622fe4c7b1eeb715d1

8
ci/windows/Dockerfile
View file

@ -5,7 +5,7 @@ SHELL [ "powershell" ]
# A version field to invalidatea Cirrus's build cache when needed, as suggested in # A version field to invalidatea Cirrus's build cache when needed, as suggested in
# https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822 # https://github.com/cirruslabs/cirrus-ci-docs/issues/544#issuecomment-566066822
ENV DOCKERFILE_VERSION 20230801 ENV DOCKERFILE_VERSION 20250528
RUN Set-ExecutionPolicy Unrestricted -Force RUN Set-ExecutionPolicy Unrestricted -Force
@ -14,8 +14,8 @@ RUN [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePoin
iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
# Install prerequisites # Install prerequisites
RUN choco install -y --no-progress visualstudio2019buildtools --version=16.11.11.0 RUN choco install -y --no-progress visualstudio2022buildtools --version=117.14.1
RUN choco install -y --no-progress visualstudio2019-workload-vctools --version=1.0.0 --package-parameters '--add Microsoft.VisualStudio.Component.VC.ATLMFC' RUN choco install -y --no-progress visualstudio2022-workload-vctools --version=1.0.0 --package-parameters '--add Microsoft.VisualStudio.Component.VC.ATLMFC'
RUN choco install -y --no-progress sed RUN choco install -y --no-progress sed
RUN choco install -y --no-progress winflexbison3 RUN choco install -y --no-progress winflexbison3
RUN choco install -y --no-progress msysgit RUN choco install -y --no-progress msysgit
@ -30,4 +30,4 @@ RUN mkdir C:\build
WORKDIR C:\build WORKDIR C:\build
# This entry point starts the developer command prompt and launches the PowerShell shell. # This entry point starts the developer command prompt and launches the PowerShell shell.
ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "-arch=x64", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Unrestricted"] ENTRYPOINT ["C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "-arch=x64", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Unrestricted"]

2
ci/windows/build.cmd
View file

@ -2,7 +2,7 @@
:: cmd current shell. This path is hard coded to the one on the CI image, but :: cmd current shell. This path is hard coded to the one on the CI image, but
:: can be adjusted if running builds locally. Unfortunately, the initial path :: can be adjusted if running builds locally. Unfortunately, the initial path
:: isn't in the environment so we have to hardcode the whole path. :: isn't in the environment so we have to hardcode the whole path.
call "c:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 call "c:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
mkdir build mkdir build
cd build cd build

2
ci/windows/test.cmd
View file

@ -1,5 +1,5 @@
:: See build.cmd for documentation on this call. :: See build.cmd for documentation on this call.
call "c:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 call "c:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
cd build cd build