fix: select when exec is windows (#886)

Fixes: #420

Author: thesayyn

.github/workflows/ci.yaml

@@ -40,11 +40,11 @@ jobs:
       - id: linux
         run: echo "os=ubuntu-latest" >> $GITHUB_OUTPUT
       - id: macos
-        run: echo "os=macos-13" >> $GITHUB_OUTPUT
+        run: echo "os=macos-15" >> $GITHUB_OUTPUT
         # Don't run MacOS if there is no TestContainers API token which is the case on forks. We need it for container tests.
         if: ${{ env.TC_CLOUD_TOKEN != '' }}
     outputs:
-      # Will look like ["ubuntu-latest", "macos-13"]
+      # Will look like ["ubuntu-latest", "macos-15"]
       os: ${{ toJSON(steps.*.outputs.os) }}
 
   test:
@@ -69,11 +69,13 @@ jobs:
         bzlmodEnabled: [true, false]
         exclude:
           # macos is expensive (billed at 10X) so don't test these
-          - os: macos-13
+          - os: macos-15
             folder: e2e/wasm
-          - os: macos-13
+          - os: macos-15
             folder: e2e/assertion
-          - os: macos-13
+          - os: macos-15
+            folder: e2e/smoke
+          - os: macos-15
             bazelversion: 7.6.2
           - folder: .
             bazelversion: 7.6.2
@@ -135,7 +137,7 @@ jobs:
         run: echo "${{ matrix.bazelversion }}" > .bazelversion
 
       - name: Configure TestContainers cloud
-        if: ${{ matrix.os == 'macos-13' }}
+        if: ${{ matrix.os == 'macos-15' }}
         uses: atomicjar/testcontainers-cloud-setup-action@main
         with:
           wait: true
@@ -144,7 +146,7 @@ jobs:
       - run: man xargs
 
       - name: Configure Remote Docker Host
-        if: ${{ matrix.os == 'macos-13' }}
+        if: ${{ matrix.os == 'macos-15' }}
         run: |
           echo "DOCKER_HOST=$(grep 'tc.host' ~/.testcontainers.properties | cut -d '=' -f2 | xargs)" >> $GITHUB_ENV
           curl -fsSL https://download.docker.com/mac/static/stable/x86_64/docker-23.0.0.tgz | tar -xOvf - docker/docker > /usr/local/bin/docker

examples/dockerfile/.bazelversion

@@ -0,0 +1,8 @@
+8.4.2
+
+# The first line of this file is used by Bazelisk and Bazel to be sure
+# the right version of Bazel is used to build and test this repo.
+# This also defines which version is used on CI.
+#
+# Note that you should also run integration_tests against other Bazel
+# versions you support.

examples/dockerfile/MODULE.bazel

@@ -4,6 +4,7 @@ module(name = "dockerfile")
 
 bazel_dep(name = "bazel_skylib", version = "1.8.2")
 bazel_dep(name = "aspect_bazel_lib", version = "2.7.2")
+bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_oci", version = "2.2.5")
 bazel_dep(name = "rules_go", version = "0.53.0")
 

oci/private/BUILD.bazel

@@ -1,4 +1,10 @@
 load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load(":windows_utils.bzl", "is_exec_platform_windows")
+
+is_exec_platform_windows(
+    name = "is_exec_platform_windows",
+    visibility = ["//visibility:public"],
+)
 
 exports_files(
     glob(["*.bzl"]),
@@ -103,7 +109,14 @@ bzl_library(
     srcs = ["util.bzl"],
     visibility = ["//oci:__subpackages__"],
     deps = [
+        ":windows_utils",
         "@bazel_skylib//lib:paths",
         "@bazel_skylib//lib:versions",
     ],
 )
+
+bzl_library(
+    name = "windows_utils",
+    srcs = ["windows_utils.bzl"],
+    visibility = ["//oci:__subpackages__"],
+)

oci/private/image.bzl

@@ -96,8 +96,7 @@ If `group/gid` is not specified, the default group and supplementary groups of t
     "annotations": attr.label(doc = "A file containing a dictionary of annotations. Each line should be in the form `name=value`.", allow_single_file = True),
     "_image_sh": attr.label(default = "image.sh", allow_single_file = True),
     "_descriptor_sh": attr.label(default = "descriptor.sh", executable = True, cfg = "exec", allow_single_file = True),
-    "_windows_constraint": attr.label(default = "@platforms//os:windows"),
-}
+} | util.IS_EXEC_PLATFORM_WINDOWS_ATTRS
 
 def _platform_str(os, arch, variant = None):
     parts = dict(os = os, architecture = arch)
@@ -241,7 +240,7 @@ def _oci_image_impl(ctx):
     action_env = {}
 
     # Windows: Don't convert arguments like --entrypoint=/some/bin to --entrypoint=C:/msys64/some/bin
-    if ctx.target_platform_has_constraint(ctx.attr._windows_constraint[platform_common.ConstraintValueInfo]):
+    if util.is_windows_exec(ctx):
         # See https://www.msys2.org/wiki/Porting/:
         # > Setting MSYS2_ARG_CONV_EXCL=* prevents any path transformation.
         action_env["MSYS2_ARG_CONV_EXCL"] = "*"

oci/private/load.bzl

@@ -130,8 +130,7 @@ attrs = {
     ),
     "_tarball_sh": attr.label(allow_single_file = True, default = "//oci/private:tarball.sh.tpl"),
     "_runfiles": attr.label(default = "@bazel_tools//tools/bash/runfiles"),
-    "_windows_constraint": attr.label(default = "@platforms//os:windows"),
-}
+} | util.IS_EXEC_PLATFORM_WINDOWS_ATTRS
 
 def _get_workspace_name(ctx, file):
     label = getattr(file, "owner", None)

oci/private/push.bzl

@@ -176,12 +176,11 @@ _attrs = {
         allow_single_file = True,
     ),
     "_runfiles": attr.label(default = "@bazel_tools//tools/bash/runfiles"),
-    "_windows_constraint": attr.label(default = "@platforms//os:windows"),
     "_jq": attr.label(
         default = "@jq_toolchains//:resolved_toolchain",
         cfg = "exec",
     ),
-}
+} | util.IS_EXEC_PLATFORM_WINDOWS_ATTRS
 
 def _quote_args(args):
     return ["\"{}\"".format(arg) for arg in args]

oci/private/util.bzl

@@ -2,6 +2,7 @@
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@bazel_skylib//lib:versions.bzl", "versions")
+load(":windows_utils.bzl", "IS_EXEC_PLATFORM_WINDOWS_ATTRS", "is_windows_exec")
 
 _IMAGE_PLATFORM_VARIANT_DEFAULTS = {
     "linux/arm64": "v8",
@@ -197,11 +198,11 @@ def _maybe_wrap_launcher_for_windows(ctx, bash_launcher):
     but without requiring that the script has a .runfiles folder.
 
     To use:
-    - add the _windows_constraint appears in the rule attrs
+    - add IS_EXEC_PLATFORM_WINDOWS_ATTRS to the rule attrs
     - make sure the bash_launcher is in the inputs to the action
     - @bazel_tools//tools/sh:toolchain_type should appear in the rules toolchains
     """
-    if not ctx.target_platform_has_constraint(ctx.attr._windows_constraint[platform_common.ConstraintValueInfo]):
+    if not is_windows_exec(ctx):
         return bash_launcher
 
     win_launcher = ctx.actions.declare_file("wrap_%s.bat" % ctx.label.name)
@@ -295,4 +296,6 @@ util = struct(
     build_manifest_json = _build_manifest_json,
     assert_crane_version_at_least = _assert_crane_version_at_least,
     platform_triplet = _platform_triplet,
+    is_windows_exec = is_windows_exec,
+    IS_EXEC_PLATFORM_WINDOWS_ATTRS = IS_EXEC_PLATFORM_WINDOWS_ATTRS,
 )

oci/private/windows_utils.bzl

@@ -0,0 +1,41 @@
+"""Utilities for detecting Windows execution platform."""
+
+def _is_exec_platform_windows(ctx):
+    is_windows = ctx.target_platform_has_constraint(ctx.attr._windows_constraint[platform_common.ConstraintValueInfo])
+    executable = ctx.actions.declare_file("windows_exec.bats")
+    ctx.actions.write(
+        executable,
+        content = "@noop",
+    )
+
+    return [
+        DefaultInfo(executable = executable),
+        OutputGroupInfo(windows = depset()) if is_windows else OutputGroupInfo(),
+    ]
+
+is_exec_platform_windows = rule(
+    implementation = _is_exec_platform_windows,
+    attrs = {
+        "_windows_constraint": attr.label(default = Label("@platforms//os:windows")),
+    },
+)
+
+IS_EXEC_PLATFORM_WINDOWS_ATTRS = {
+    "_is_platform_windows_exec": attr.label(
+        default = Label("//oci/private:is_exec_platform_windows"),
+        executable = True,
+        cfg = "exec",
+    ),
+}
+
+def is_windows_exec(ctx):
+    """Utility function for checking if the action run on windows.
+
+    TODO: explain
+
+    Args:
+        ctx: rule context
+    """
+
+    outputgroupinfo = ctx.attr._is_platform_windows_exec[OutputGroupInfo]
+    return hasattr(outputgroupinfo, "windows")