From e8132c51c15a8bd9502b9414cfff52c6ffb507d9 Mon Sep 17 00:00:00 2001
From: Tom Proctor <tomhjp@users.noreply.github.com>
Date: Fri, 28 Nov 2025 10:48:40 +0000
Subject: [PATCH] reduce number of changes to see perf

Change-Id: I7644590e05a294e28f0acc9194a950a503822929
Signed-off-by: Tom Proctor <tomhjp@users.noreply.github.com>
---
 .github/actions/go-cache/action.yml |  3 +++
 .github/workflows/test.yml          | 36 +++++++++++------------------
 cmd/cigocacher/cigocacher.go        |  4 +++-
 flake.nix                           |  2 +-
 go.mod.sri                          |  2 +-
 shell.nix                           |  2 +-
 6 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/.github/actions/go-cache/action.yml b/.github/actions/go-cache/action.yml
index bc37965d3..a671530f8 100644
--- a/.github/actions/go-cache/action.yml
+++ b/.github/actions/go-cache/action.yml
@@ -8,6 +8,9 @@ inputs:
   checkout-path:
     description: Path to cloned repository
     required: true
+  cache-dir:
+    description: Directory to use for caching
+    required: true
 
 outputs:
   success:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 57e4062c9..f8e2ecf32 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -213,7 +213,7 @@ jobs:
     # org with 8 cores and 32 GB of RAM:
     # https://github.com/organizations/tailscale/settings/actions/github-hosted-runners/1
     runs-on: ci-windows-github-1
-    # needs: gomod-cache
+    needs: gomod-cache
     name: Windows (${{ matrix.name || matrix.shard}})
     strategy:
       fail-fast: false # don't abort the entire matrix if one element fails
@@ -230,55 +230,45 @@ jobs:
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         path: src
-    # - name: Restore Go module cache
-    #   uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
-    #   with:
-    #     path: 
-    - uses: samypr100/setup-dev-drive@30f0f98ae5636b2b6501e181dfb3631b9974818d # v4.0.0
-      with:
-        drive-size: 50GB # 300GB available: https://docs.github.com/en/enterprise-cloud@latest/actions/reference/runners/larger-runners#machine-sizes-for-larger-runners
-        trusted-dev-drive: true
-        workspace-copy: true
 
     - name: Install Go
       uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
       with:
-        go-version-file: ${{ env.DEV_DRIVE_WORKSPACE }}/src/go.mod
+        go-version-file: src/go.mod
         cache: false
 
-    # - name: Restore Go module cache
-    #   uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
-    #   with:
-    #     path: gomodcache
-    #     key: ${{ needs.gomod-cache.outputs.cache-key }}
-    #     enableCrossOsArchive: true
+    - name: Restore Go module cache
+      uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      with:
+        path: gomodcache
+        key: ${{ needs.gomod-cache.outputs.cache-key }}
+        enableCrossOsArchive: true
 
     - name: Setup cigocacher
       id: cigocacher-setup
       uses: ./src/.github/actions/go-cache
       with:
-        checkout-path: ${{ env.DEV_DRIVE_WORKSPACE }}/src
-        cache-dir: ${{ env.DEV_DRIVE_WORKSPACE }}/cigocacher
+        checkout-path: src
+        cache-dir: cigocacher
         cigocached-url: ${{ vars.CIGOCACHED_AZURE_URL }}
 
     - name: test
       if: matrix.key != 'win-bench' # skip on bench builder
-      working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}/src
+      working-directory: src
       run: go run ./cmd/testwrapper sharded:${{ matrix.shard }}
 
     - name: bench all
       if: matrix.key == 'win-bench'
-      working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}/src
+      working-directory: src
       # Don't use -bench=. -benchtime=1x.
       # Somewhere in the layers (powershell?)
       # the equals signs cause great confusion.
       run: go test ./... -bench . -benchtime 1x -run "^$"
 
     - name: Tidy cache
-      working-directory: ${{ env.DEV_DRIVE_WORKSPACE }}/src
       shell: pwsh
       run: |
-        Get-ChildItem -Path "${{ env.DEV_DRIVE_WORKSPACE }}\cigocacher" -File -Recurse |
+        Get-ChildItem -Path cigocacher -File -Recurse |
           Where-Object { $_.LastAccessTime -lt (Get-Date).AddMinutes(-90) } |
           Remove-Item -Force
 
diff --git a/cmd/cigocacher/cigocacher.go b/cmd/cigocacher/cigocacher.go
index c323224b0..77efa7d8b 100644
--- a/cmd/cigocacher/cigocacher.go
+++ b/cmd/cigocacher/cigocacher.go
@@ -75,7 +75,9 @@ func main() {
 		verbose: *verbose,
 	}
 	if *cigocachedURL != "" {
-		log.Printf("Using cigocached at %s", *cigocachedURL)
+		if *verbose {
+			log.Printf("Using cigocached at %s", *cigocachedURL)
+		}
 		c.gocached = &gocachedClient{
 			baseURL:     *cigocachedURL,
 			cl:          httpClient(),
diff --git a/flake.nix b/flake.nix
index 855ce555b..2625cdd09 100644
--- a/flake.nix
+++ b/flake.nix
@@ -151,4 +151,4 @@
     });
   };
 }
-# nix-direnv cache busting line: sha256-IkodqRYdueML7U2Hh8vRw6Et7+WII+VXuPJ3jZ2xYx8=
+# nix-direnv cache busting line: sha256-4AFRl1Dd6S2HusZFtK+kCqD3RGTmLytQ5EhYYvlZrL4=
diff --git a/go.mod.sri b/go.mod.sri
index 329fe9405..645004ba6 100644
--- a/go.mod.sri
+++ b/go.mod.sri
@@ -1 +1 @@
-sha256-IkodqRYdueML7U2Hh8vRw6Et7+WII+VXuPJ3jZ2xYx8=
+sha256-4AFRl1Dd6S2HusZFtK+kCqD3RGTmLytQ5EhYYvlZrL4=
diff --git a/shell.nix b/shell.nix
index 28bdbdafb..67dbf7b74 100644
--- a/shell.nix
+++ b/shell.nix
@@ -16,4 +16,4 @@
 ) {
   src =  ./.;
 }).shellNix
-# nix-direnv cache busting line: sha256-IkodqRYdueML7U2Hh8vRw6Et7+WII+VXuPJ3jZ2xYx8=
+# nix-direnv cache busting line: sha256-4AFRl1Dd6S2HusZFtK+kCqD3RGTmLytQ5EhYYvlZrL4=