more good powershell

buildkite · May 16, 2023 · 95775d0 · 95775d0
1 parent cb9314b
commit 95775d0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.buildkite/Dockerfile-test-windows b/.buildkite/Dockerfile-test-windows
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/windows/servercore:ltsc2019
+FROM mcr.microsoft.com/windows:ltsc2019
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
@@ -13,3 +13,5 @@ RUN choco feature enable -n allowGlobalConfirmation;
 # Install Build Tools
 RUN choco install golang --version 1.20.4;
 RUN choco install ruby --version 2.7.7.1;
+RUN choco install gnuwin32-coreutils.install;
+RUN choco install git;
diff --git a/.buildkite/docker-compose.yml b/.buildkite/docker-compose.yml
@@ -7,12 +7,14 @@ services:
       dockerfile: Dockerfile-test-windows
     volumes:
       - "../:C:\\work"
+      - "go-mod-cache:C:\\gomodcache"
     working_dir: "C:\\work"
     environment:
       - BUILDKITE_BUILD_NUMBER
       - BUILDKITE_JOB_ID
       - "BUILDKITE_AGENT_TAGS=queue=default"
       - "BUILDKITE_BUILD_PATH=/buildkite"
+      - "GOMODCACHE=C:\\gomodcache"
 
   agent:
     build:
@@ -41,3 +43,4 @@ services:
 
 volumes:
   ruby-2-7-6-agent-gem-cache: ~
+  go-mod-cache:
diff --git a/.buildkite/steps/tests-windows.ps1 b/.buildkite/steps/tests-windows.ps1
@@ -1,9 +1,11 @@
-pwd
+$ErrorActionPreference = "Stop"
 
 go install "gotest.tools/gotestsum@v1.8.0"
 
 echo '+++ Running tests'
 gotestsum --junitfile "junit-${BUILDKITE_JOB_ID}.xml" -- -count=1 -failfast ./...
+If ($lastexitcode -ne 0) { Exit $lastexitcode }
 
 echo '+++ Running integration tests for git-mirrors experiment'
-TEST_EXPERIMENT=git-mirrors gotestsum --junitfile "junit-${BUILDKITE_JOB_ID}-git-mirrors.xml" -- -count=1 -failfast ./bootstrap/integration
+$Env:TEST_EXPERIMENT = "git-mirrors"; gotestsum --junitfile "junit-${BUILDKITE_JOB_ID}-git-mirrors.xml" -- -count=1 -failfast ./bootstrap/integration
+If ($lastexitcode -ne 0) { Exit $lastexitcode }