Relax Docker Builder requirements on non-Windows platforms (#773)

* Relax Docker Builder requirements on non-Windows platforms * .golangci.yml: exclude G115 gosec's rule
cirruslabs · Aug 26, 2024 · ea7e853 · ea7e853
1 parent cbf2d0e
commit ea7e853
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/.golangci.yml b/.golangci.yml
@@ -8,6 +8,10 @@ linters-settings:
   exhaustive:
     default-signifies-exhaustive: true
 
+  gosec:
+    excludes:
+      - G115
+
 linters:
   enable:
   - asciicheck

diff --git a/internal/executor/instance/instance.go b/internal/executor/instance/instance.go
@@ -100,7 +100,10 @@ func NewFromProto(
 	case *api.DockerBuilder:
 		// Ensures that we're not trying to run e.g. Windows-specific scripts on macOS
 		instanceOS := strings.ToLower(instance.Platform.String())
-		if runtime.GOOS != instanceOS {
+
+		haveOrNeedWindows := runtime.GOOS == "windows" || instanceOS == "windows"
+
+		if runtime.GOOS != instanceOS && haveOrNeedWindows {
 			return nil, fmt.Errorf("%w: cannot run %s Docker Builder instance on this platform",
 				ErrFailedToCreateInstance, cases.Title(language.AmericanEnglish).String(instanceOS))
 		}