Fix Windows Bazel invocation in CI

Author: Trinkle23897

.bazelrc

@@ -29,7 +29,8 @@ test:macos --test_env=PATH=/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/s
 
 build:windows --cxxopt=/std:c++17
 build:windows --host_cxxopt=/std:c++17
-build:windows --client_env=BAZEL_CXXOPTS=/std:c++17
+build:windows --action_env=BAZEL_SH
+build:windows --repo_env=BAZEL_SH
 build:windows --enable_runfiles
 test:windows --test_env=PATH
 

.github/workflows/release.yml

@@ -117,6 +117,7 @@ jobs:
       BAZEL_SH: C:/Program Files/Git/bin/bash.exe
       MSYS2_ARG_CONV_EXCL: "*"
       MSYS_NO_PATHCONV: "1"
+      USE_BAZEL_VERSION: "8.6.0"
     steps:
       - name: Cancel previous run
         uses: styfle/cancel-workflow-action@0.11.0
@@ -138,7 +139,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Windows dependencies
-        shell: bash
+        shell: pwsh
         run: |
           choco install -y make ninja strawberryperl swig
       - name: Install Qt 5
@@ -148,24 +149,34 @@ jobs:
           arch: "win64_msvc2019_64"
           set-env: "true"
       - name: Export Qt location
-        shell: bash
+        shell: pwsh
         run: |
-          echo "BAZEL_RULES_QT_DIR=${QT_ROOT_DIR}" >> "$GITHUB_ENV"
+          Add-Content -Path $env:GITHUB_ENV -Value "BAZEL_RULES_QT_DIR=$env:QT_ROOT_DIR"
       - name: Install bazelisk
-        shell: bash
+        shell: pwsh
         run: |
           go install github.com/bazelbuild/bazelisk@latest
-          echo "$HOME/go/bin" >> "$GITHUB_PATH"
+          Add-Content -Path $env:GITHUB_PATH -Value (Join-Path $HOME "go/bin")
       - name: Build
-        shell: bash
+        shell: pwsh
         run: |
-          rm -rf dist
-          make RELEASE_PYTHON=${{ matrix.python-version }} bazel-release
-          pip3 install dist/*.whl --force-reinstall
+          Copy-Item third_party/pip_requirements/requirements-release-lock.txt third_party/pip_requirements/requirements.txt -Force
+          Remove-Item dist -Recurse -Force -ErrorAction SilentlyContinue
+          $releaseSetupTarget = "//:setup_py${{ replace(matrix.python-version, '.', '') }}"
+          bazelisk run $releaseSetupTarget --config=release -- bdist_wheel
+          New-Item -ItemType Directory -Force -Path dist | Out-Null
+          Copy-Item "bazel-bin/$($releaseSetupTarget.Substring(3)).runfiles/envpool/dist/*.whl" dist/
+          pip3 install (Get-ChildItem dist/*.whl | Select-Object -ExpandProperty FullName) --force-reinstall
       - name: Test
-        shell: bash
+        shell: pwsh
         run: |
-          make release-test
+          Push-Location envpool
+          python3 make_test.py
+          Pop-Location
+          Push-Location examples
+          python3 make_env.py
+          python3 env_step.py
+          Pop-Location
       - name: Upload artifact
         uses: actions/upload-artifact@v7
         with:

.github/workflows/test.yml

@@ -161,6 +161,7 @@ jobs:
       DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
       MSYS2_ARG_CONV_EXCL: "*"
       MSYS_NO_PATHCONV: "1"
+      USE_BAZEL_VERSION: "8.6.0"
     steps:
       - name: Cancel previous run
         uses: styfle/cancel-workflow-action@0.11.0
@@ -190,7 +191,7 @@ jobs:
             pip-test-v1-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('third_party/pip_requirements/requirements-dev-lock.txt') }}-
             pip-test-v1-${{ runner.os }}-${{ runner.arch }}-
       - name: Install Windows dependencies
-        shell: bash
+        shell: pwsh
         run: |
           choco install -y make ninja strawberryperl swig
       - name: Install Qt 5
@@ -200,9 +201,9 @@ jobs:
           arch: "win64_msvc2019_64"
           set-env: "true"
       - name: Export Qt location
-        shell: bash
+        shell: pwsh
         run: |
-          echo "BAZEL_RULES_QT_DIR=${QT_ROOT_DIR}" >> "$GITHUB_ENV"
+          Add-Content -Path $env:GITHUB_ENV -Value "BAZEL_RULES_QT_DIR=$env:QT_ROOT_DIR"
       - name: Restore Bazel caches
         uses: actions/cache/restore@v4
         with:
@@ -215,16 +216,17 @@ jobs:
             bazel-test-v3-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.bazelversion') }}-${{ env.DEFAULT_BRANCH }}-
             bazel-test-v3-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.bazelversion') }}-
       - name: Install bazelisk
-        shell: bash
+        shell: pwsh
         run: |
           go install github.com/bazelbuild/bazelisk@latest
-          echo "$HOME/go/bin" >> "$GITHUB_PATH"
+          Add-Content -Path $env:GITHUB_PATH -Value (Join-Path $HOME "go/bin")
       - name: Test
-        shell: bash
+        shell: pwsh
         run: |
-          repo_cache="$(cygpath -m "$HOME/.cache/envpool-bazel-repo")"
-          disk_cache="$(cygpath -m "$HOME/.cache/envpool-bazel-disk")"
-          make BAZELOPT="--repository_cache=${repo_cache} --disk_cache=${disk_cache}" bazel-test
+          Copy-Item third_party/pip_requirements/requirements-dev-lock.txt third_party/pip_requirements/requirements.txt -Force
+          $repoCache = Join-Path $HOME ".cache/envpool-bazel-repo"
+          $diskCache = Join-Path $HOME ".cache/envpool-bazel-disk"
+          bazelisk test --test_output=all --repository_cache=$repoCache --disk_cache=$diskCache //... --config=test --spawn_strategy=local --color=yes
       - name: Save Bazel caches
         if: ${{ always() && !cancelled() }}
         uses: actions/cache/save@v4

third_party/zlib/zlib.BUILD

@@ -18,6 +18,11 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])  # BSD/MIT-like license (for zlib)
 
+config_setting(
+    name = "windows",
+    values = {"cpu": "x64_windows"},
+)
+
 cc_library(
     name = "zlib",
     srcs = [
@@ -48,9 +53,12 @@ cc_library(
         "zutil.h",
     ],
     hdrs = ["zlib.h"],
-    copts = [
-        "-Wno-shift-negative-value",
-        "-DZ_HAVE_UNISTD_H",
-    ],
+    copts = select({
+        ":windows": [],
+        "//conditions:default": [
+            "-Wno-shift-negative-value",
+            "-DZ_HAVE_UNISTD_H",
+        ],
+    }),
     includes = ["."],
 )