Skip to content

Commit e364b82

Browse files
committed
win update
1 parent 9691f0d commit e364b82

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build/win32/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ message("-- Detecting Mbed TLS version - ${MBEDTLS_VERSION}")
9494

9595
project(libModSecurity
9696
VERSION
97-
3.0.12
97+
3.0.14
9898
LANGUAGES
9999
CXX
100100
)

build/win32/docker/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN C:\TEMP\InstallBuildTools.cmd C:\TEMP\vs_buildtools.exe --quiet --wait --nor
2424
--installPath C:\BuildTools
2525

2626
# download & install GIT
27-
ARG GIT_VERSION=2.44.0
27+
ARG GIT_VERSION=2.53.0
2828
ARG GIT_BINARY=Git-${GIT_VERSION}-64-bit.exe
2929
ARG GIT_URL=https://github.com/git-for-windows/git/releases/download/v${GIT_VERSION}.windows.1/${GIT_BINARY}
3030

@@ -35,7 +35,7 @@ RUN %INSTALLER% /SP- /VERYSILENT /SUPPRESSMSGBOXES /NOCANCEL `
3535
/NORESTART /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /LOADINF=git.inf
3636

3737
# download & setup conan
38-
ARG CONAN_VERSION=2.10.2
38+
ARG CONAN_VERSION=2.27.1
3939
ARG CONAN_BINARY=conan-${CONAN_VERSION}-windows-x86_64-installer.exe
4040
ARG CONAN_URL=https://github.com/conan-io/conan/releases/download/${CONAN_VERSION}/${CONAN_BINARY}
4141

@@ -87,7 +87,7 @@ RUN cmd.exe /C copy "C:\Program Files\GIT\usr\bin" \bin > NUL
8787
RUN cmd.exe /C copy "C:\Program Files\GIT\usr\bin\echo.exe" \bin\echo > NUL
8888

8989
# disable tests that don't work on windows
90-
ARG JQ_VERSION=1.7.1
90+
ARG JQ_VERSION=1.8.1
9191
ARG JQ_BINARY=jq-windows-amd64.exe
9292
ARG JQ_URL=https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/${JQ_BINARY}
9393

0 commit comments

Comments
 (0)