Skip to content

Commit bb6f4fa

Browse files
committedMar 29, 2024
ci: try build windows
1 parent 0714709 commit bb6f4fa

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed
 

‎build.bat

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@ echo off
1616
setlocal
1717

1818
if not defined PYTHON set PYTHON=python
19-
:: GitHub CI windows-2022
20-
set BAZEL_VS=C:\Program Files\Microsoft Visual Studio\2022\Enterprise
21-
set BAZEL_VC=C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC
19+
set BAZEL_VS=C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools
20+
set BAZEL_VC=C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC
2221
call "%BAZEL_VC%\Auxiliary\Build\vcvars64.bat"
2322

2423
for /f %%i in ('%PYTHON% -c "import sys;print(sys.executable)"') do set PYTHON_BIN_PATH=%%i

‎docker/Dockerfile.windows

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN choco install -y 7zip
2828
RUN setx /M PATH $($Env:PATH + ';C:\Program Files\7-Zip')
2929

3030
# Install msys2
31-
ARG MSYS_VERSION=20200602
31+
ARG MSYS_VERSION=20240113
3232
ADD http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-${MSYS_VERSION}.tar.xz c:/windows/temp
3333
RUN 7z.exe x c:\windows\temp\msys2-base-x86_64-$env:MSYS_VERSION.tar.xz
3434
RUN 7z.exe x c:\msys2-base-x86_64-$env:MSYS_VERSION.tar -o"c:\\"
@@ -41,9 +41,9 @@ RUN 7z.exe x -y c:\windows\temp\patch-$env:PATCH_VERSION-x86_64.pkg.tar.xz
4141
RUN 7z.exe x -y c:\patch-$env:PATCH_VERSION-x86_64.pkg.tar -o"c:\\msys64"
4242

4343
# Install vim (for xxd)
44-
ARG VIM_VERSION=8.2.0592-1
45-
ADD http://repo.msys2.org/msys/x86_64/vim-${VIM_VERSION}-x86_64.pkg.tar.xz c:/windows/temp
46-
RUN 7z.exe x -y c:\windows\temp\vim-$env:VIM_VERSION-x86_64.pkg.tar.xz
44+
ARG VIM_VERSION=9.1.0000-1
45+
ADD http://repo.msys2.org/msys/x86_64/vim-${VIM_VERSION}-x86_64.pkg.tar.zst c:/windows/temp
46+
RUN 7z.exe x -y c:\windows\temp\vim-$env:VIM_VERSION-x86_64.pkg.tar.zst
4747
RUN 7z.exe x -y c:\vim-$env:VIM_VERSION-x86_64.pkg.tar -o"c:\\msys64"
4848

4949
# Install libusb release package
@@ -52,5 +52,5 @@ ADD https://github.com/libusb/libusb/releases/download/v${LIBUSB_VERSION}/libusb
5252
RUN 7z x -oc:\libusb c:\windows\temp\libusb-$env:LIBUSB_VERSION.7z
5353

5454
# Install Bazel
55-
ARG BAZEL_VERSION=4.2.2
55+
ARG BAZEL_VERSION=6.5.0
5656
ADD https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-windows-x86_64.exe c:/windows/system32/bazel.exe

0 commit comments

Comments
 (0)