Browse code

ci: fix cache for go modules

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

CrazyMax authored on 2025/10/07 21:59:28
Showing 7 changed files
... ...
@@ -106,7 +106,7 @@ jobs:
106 106
         uses: actions/setup-go@v5
107 107
         with:
108 108
           go-version: ${{ env.GO_VERSION }}
109
-          cache-dependency-path: vendor.sum
109
+          cache: false
110 110
       -
111 111
         name: Download reports
112 112
         uses: actions/download-artifact@v4
... ...
@@ -270,7 +270,7 @@ jobs:
270 270
         uses: actions/setup-go@v5
271 271
         with:
272 272
           go-version: ${{ env.GO_VERSION }}
273
-          cache-dependency-path: vendor.sum
273
+          cache: false
274 274
       -
275 275
         name: Download reports
276 276
         uses: actions/download-artifact@v4
... ...
@@ -302,7 +302,7 @@ jobs:
302 302
         uses: actions/setup-go@v5
303 303
         with:
304 304
           go-version: ${{ env.GO_VERSION }}
305
-          cache-dependency-path: vendor.sum
305
+          cache: false
306 306
       -
307 307
         name: Install gotestlist
308 308
         run:
... ...
@@ -486,7 +486,7 @@ jobs:
486 486
         uses: actions/setup-go@v5
487 487
         with:
488 488
           go-version: ${{ env.GO_VERSION }}
489
-          cache-dependency-path: vendor.sum
489
+          cache: false
490 490
       -
491 491
         name: Download reports
492 492
         uses: actions/download-artifact@v4
... ...
@@ -184,7 +184,7 @@ jobs:
184 184
         uses: actions/setup-go@v5
185 185
         with:
186 186
           go-version: ${{ env.GO_VERSION }}
187
-          cache-dependency-path: vendor.sum
187
+          cache: false
188 188
       -
189 189
         name: Prepare reports
190 190
         run: echo "TESTREPORTS_NAME=$(basename ${{ inputs.template }})*" >> $GITHUB_ENV
... ...
@@ -71,18 +71,6 @@ jobs:
71 71
             echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2022 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
72 72
           }
73 73
       -
74
-        name: Cache
75
-        uses: actions/cache@v4
76
-        with:
77
-          path: |
78
-            ~\AppData\Local\go-build
79
-            ~\go\pkg\mod
80
-            ${{ github.workspace }}\go-build
81
-            ${{ env.GOPATH }}\pkg\mod
82
-          key: ${{ inputs.os }}-${{ github.job }}-${{ hashFiles('**/vendor.sum') }}
83
-          restore-keys: |
84
-            ${{ inputs.os }}-${{ github.job }}-
85
-      -
86 74
         name: Docker info
87 75
         run: |
88 76
           docker info
... ...
@@ -98,8 +86,6 @@ jobs:
98 98
         name: Build binaries
99 99
         run: |
100 100
           & docker run --name ${{ env.TEST_CTN_NAME }} -e "DOCKER_GITCOMMIT=${{ github.sha }}" `
101
-              -v "${{ github.workspace }}\go-build:C:\Users\ContainerAdministrator\AppData\Local\go-build" `
102
-              -v "${{ github.workspace }}\go\pkg\mod:C:\gopath\pkg\mod" `
103 101
               ${{ env.TEST_IMAGE_NAME }} hack\make.ps1 -Daemon -Client
104 102
       -
105 103
         name: Copy artifacts
... ...
@@ -150,18 +136,6 @@ jobs:
150 150
             echo "WINDOWS_BASE_IMAGE_TAG=${{ env.WINDOWS_BASE_TAG_2022 }}" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
151 151
           }
152 152
       -
153
-        name: Cache
154
-        uses: actions/cache@v4
155
-        with:
156
-          path: |
157
-            ~\AppData\Local\go-build
158
-            ~\go\pkg\mod
159
-            ${{ github.workspace }}\go-build
160
-            ${{ env.GOPATH }}\pkg\mod
161
-          key: ${{ inputs.os }}-${{ github.job }}-${{ hashFiles('**/vendor.sum') }}
162
-          restore-keys: |
163
-            ${{ inputs.os }}-${{ github.job }}-
164
-      -
165 153
         name: Docker info
166 154
         run: |
167 155
           docker info
... ...
@@ -177,8 +151,6 @@ jobs:
177 177
         name: Test
178 178
         run: |
179 179
           & docker run --name ${{ env.TEST_CTN_NAME }} -e "DOCKER_GITCOMMIT=${{ github.sha }}" `
180
-            -v "${{ github.workspace }}\go-build:C:\Users\ContainerAdministrator\AppData\Local\go-build" `
181
-            -v "${{ github.workspace }}\go\pkg\mod:C:\gopath\pkg\mod" `
182 180
             -v "${{ env.GOPATH }}\src\github.com\docker\docker\bundles:C:\gopath\src\github.com\docker\docker\bundles" `
183 181
             ${{ env.TEST_IMAGE_NAME }} hack\make.ps1 -TestUnit
184 182
       -
... ...
@@ -212,7 +184,7 @@ jobs:
212 212
         uses: actions/setup-go@v5
213 213
         with:
214 214
           go-version: ${{ env.GO_VERSION }}
215
-          cache-dependency-path: vendor.sum
215
+          cache: false
216 216
       -
217 217
         name: Download artifacts
218 218
         uses: actions/download-artifact@v4
... ...
@@ -242,7 +214,7 @@ jobs:
242 242
         uses: actions/setup-go@v5
243 243
         with:
244 244
           go-version: ${{ env.GO_VERSION }}
245
-          cache-dependency-path: vendor.sum
245
+          cache: false
246 246
       -
247 247
         name: Install gotestlist
248 248
         run:
... ...
@@ -296,6 +268,12 @@ jobs:
296 296
         with:
297 297
           path: ${{ env.GOPATH }}/src/github.com/docker/docker
298 298
       -
299
+        name: Set up Go
300
+        uses: actions/setup-go@v5
301
+        with:
302
+          go-version: ${{ env.GO_VERSION }}
303
+          cache: false
304
+      -
299 305
         name: Set up Jaeger
300 306
         run: |
301 307
           # Jaeger is set up on Linux through the setup-tracing action. If you update Jaeger here, don't forget to
... ...
@@ -427,12 +405,6 @@ jobs:
427 427
         env:
428 428
           DOCKER_HOST: npipe:////./pipe/docker_engine
429 429
       -
430
-        name: Set up Go
431
-        uses: actions/setup-go@v5
432
-        with:
433
-          go-version: ${{ env.GO_VERSION }}
434
-          cache-dependency-path: vendor.sum
435
-      -
436 430
         name: Test integration
437 431
         if: matrix.test == './...'
438 432
         run: |
... ...
@@ -523,7 +495,7 @@ jobs:
523 523
         uses: actions/setup-go@v5
524 524
         with:
525 525
           go-version: ${{ env.GO_VERSION }}
526
-          cache-dependency-path: vendor.sum
526
+          cache: false
527 527
       -
528 528
         name: Download reports
529 529
         uses: actions/download-artifact@v4
... ...
@@ -165,7 +165,7 @@ jobs:
165 165
         uses: actions/setup-go@v5
166 166
         with:
167 167
           go-version: ${{ env.GO_VERSION }}
168
-          cache-dependency-path: vendor.sum
168
+          cache: false
169 169
       -
170 170
         name: Download reports
171 171
         uses: actions/download-artifact@v4
... ...
@@ -268,7 +268,7 @@ jobs:
268 268
         uses: actions/setup-go@v5
269 269
         with:
270 270
           go-version: ${{ env.GO_VERSION }}
271
-          cache-dependency-path: vendor.sum
271
+          cache: false
272 272
       -
273 273
         name: Download reports
274 274
         uses: actions/download-artifact@v4
... ...
@@ -108,7 +108,7 @@ jobs:
108 108
         uses: actions/setup-go@v5
109 109
         with:
110 110
           go-version: ${{ env.GO_VERSION }}
111
-          cache-dependency-path: vendor.sum
111
+          cache: false
112 112
       -
113 113
         name: BuildKit ref
114 114
         run: |
... ...
@@ -191,6 +191,7 @@ jobs:
191 191
       - name: Env
192 192
         run: |
193 193
           Get-ChildItem Env: | Out-String
194
+
194 195
       - name: Moby - Init
195 196
         run: |
196 197
           New-Item -ItemType "directory" -Path "${{ github.workspace }}\go-build"
... ...
@@ -201,18 +202,7 @@ jobs:
201 201
         uses: actions/setup-go@v5
202 202
         with:
203 203
           go-version: ${{ env.GO_VERSION }}
204
-          cache-dependency-path: vendor.sum
205
-      - name: Cache
206
-        uses: actions/cache@v4
207
-        with:
208
-          path: |
209
-            ~\AppData\Local\go-build
210
-            ~\go\pkg\mod
211
-            ${{ github.workspace }}\go-build
212
-            ${{ env.GOPATH }}\pkg\mod
213
-          key: ${{ inputs.os }}-${{ github.job }}-${{ hashFiles('**/vendor.sum') }}
214
-          restore-keys: |
215
-            ${{ inputs.os }}-${{ github.job }}-
204
+          cache: false
216 205
 
217 206
       - name: Docker info
218 207
         run: |
... ...
@@ -312,22 +302,27 @@ jobs:
312 312
             disabledFeatures="${disabledFeatures},merge_diff"
313 313
           fi
314 314
           echo "BUILDKIT_TEST_DISABLE_FEATURES=${disabledFeatures}" >> $GITHUB_ENV
315
+
315 316
       - name: Expose GitHub Runtime
316 317
         uses: crazy-max/ghaction-github-runtime@v3
318
+
317 319
       - name: Checkout
318 320
         uses: actions/checkout@v4
319 321
         with:
320 322
           path: moby
323
+
321 324
       - name: Set up Go
322 325
         uses: actions/setup-go@v5
323 326
         with:
324 327
           go-version: ${{ env.GO_VERSION }}
325
-          cache-dependency-path: vendor.sum
328
+          cache: false
329
+
326 330
       - name: BuildKit ref
327 331
         shell: bash
328 332
         run: |
329 333
           echo "$(./hack/buildkit-ref)" >> $GITHUB_ENV
330 334
         working-directory: moby
335
+
331 336
       - name: Checkout BuildKit ${{ env.BUILDKIT_REF }}
332 337
         uses: actions/checkout@v4
333 338
         with:
... ...
@@ -362,6 +357,7 @@ jobs:
362 362
            testFlags="${testFlags} --run=TestIntegration/$testSliceOffset.*/worker=${{ matrix.worker }}"
363 363
           fi
364 364
           echo "TESTFLAGS=${testFlags}" >> $GITHUB_ENV
365
+
365 366
       - name: Test
366 367
         shell: bash
367 368
         run: |
... ...
@@ -32,6 +32,9 @@ on:
32 32
     #        * * * * *
33 33
     - cron: '0 9 * * 4'
34 34
 
35
+env:
36
+  GO_VERSION: "1.24.7"
37
+
35 38
 jobs:
36 39
   codeql:
37 40
     runs-on: ubuntu-24.04
... ...
@@ -46,10 +49,11 @@ jobs:
46 46
         uses: actions/checkout@v4
47 47
         with:
48 48
           fetch-depth: 2
49
-      - name: Update Go
49
+      - name: Set up Go
50 50
         uses: actions/setup-go@v5
51 51
         with:
52
-          go-version: "1.24.7"
52
+          go-version: ${{ env.GO_VERSION }}
53
+          cache: false
53 54
       - name: Initialize CodeQL
54 55
         uses: github/codeql-action/init@v3
55 56
         with: