From 9bb87e11ca4176027f3dd9c83261dd671e929235 Mon Sep 17 00:00:00 2001
From: Tom Proctor <tomhjp@users.noreply.github.com>
Date: Fri, 28 Nov 2025 11:45:54 +0000
Subject: [PATCH] absolute paths

Change-Id: I277d078620a01f9fd4ccf7dba60a9b811c2fe424
Signed-off-by: Tom Proctor <tomhjp@users.noreply.github.com>
---
 .github/workflows/test.yml     | 16 +++++++++++-----
 cmd/cigocacher/disk_windows.go |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d3d3d9e66..d9e31de29 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -229,37 +229,43 @@ jobs:
     - name: checkout
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
-        path: src
+        path: ${{ github.workspace }}/src
 
     - name: Install Go
       uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
       with:
-        go-version-file: src/go.mod
+        go-version-file: ${{ github.workspace }}/src/go.mod
         cache: false
 
     - name: Restore Go module cache
       uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
-        path: gomodcache
+        path: ${{ github.workspace }}/gomodcache
         key: ${{ needs.gomod-cache.outputs.cache-key }}
         enableCrossOsArchive: true
 
     - name: Setup cigocacher
       id: cigocacher-setup
       uses: ./src/.github/actions/go-cache
+      env:
+        GOMODCACHE: ${{ github.workspace }}/gomodcache
       with:
-        checkout-path: src
-        cache-dir: cigocacher
+        checkout-path: ${{ github.workspace }}/src
+        cache-dir: ${{ github.workspace }}/cigocacher
         cigocached-url: ${{ vars.CIGOCACHED_AZURE_URL }}
 
     - name: test
       if: matrix.key != 'win-bench' # skip on bench builder
       working-directory: src
+      env:
+        GOMODCACHE: ${{ github.workspace }}/gomodcache
       run: go run ./cmd/testwrapper sharded:${{ matrix.shard }}
 
     - name: bench all
       if: matrix.key == 'win-bench'
       working-directory: src
+      env:
+        GOMODCACHE: ${{ github.workspace }}/gomodcache
       # Don't use -bench=. -benchtime=1x.
       # Somewhere in the layers (powershell?)
       # the equals signs cause great confusion.
diff --git a/cmd/cigocacher/disk_windows.go b/cmd/cigocacher/disk_windows.go
index bf001ed49..6601c997e 100644
--- a/cmd/cigocacher/disk_windows.go
+++ b/cmd/cigocacher/disk_windows.go
@@ -20,7 +20,7 @@ func (dc *DiskCache) writeActionFile(b []byte, actionID string) (retErr error) {
 	defer func() {
 		cerr := f.Close()
 		if retErr != nil || cerr != nil {
-			retErr = errors.Join(retErr, cerr)
+			retErr = errors.Join(retErr, cerr, os.Remove(dest))
 		}
 	}()
 
@@ -77,7 +77,7 @@ func (dc *DiskCache) writeOutputFile(r io.Reader, size int64, outputID string) (
 	defer func() {
 		cerr := f.Close()
 		if retErr != nil || cerr != nil {
-			retErr = errors.Join(retErr, cerr)
+			retErr = errors.Join(retErr, cerr, os.Remove(dest))
 		}
 	}()