Skip to content

Commit e95fd4f

Browse files
Merge pull request #27039 from Luap99/golangci-cache
cirrus: fix golangci-lint cache leak + update freebsd version
2 parents 2e15251 + bd7aada commit e95fd4f

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

.cirrus.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ validate-source_task:
122122
setup_script: &setup '$GOSRC/$SCRIPT_BASE/setup_environment.sh'
123123
golangci-lint_cache:
124124
folder: /root/.cache/golangci-lint
125-
reupload_on_changes: true
126-
fingerprint_script:
125+
fingerprint_script: &golangci_cache_fingerprint
127126
- go version
128127
- grep GOLANGCI_LINT_VERSION Makefile | head -1
128+
- date +%U
129129
# Standard main execution stage call, used by nearly every task in CI.
130130
main_script: &main '/usr/bin/time --verbose --output="$STATS_LOGFILE" $GOSRC/$SCRIPT_BASE/runner.sh'
131131

@@ -331,7 +331,7 @@ freebsd_alt_build_task:
331331
TEST_FLAVOR: "altbuild"
332332
ALT_NAME: 'FreeBSD Cross'
333333
freebsd_instance:
334-
image_family: freebsd-13-4
334+
image_family: freebsd-14-3
335335
# golangci-lint is a very, very hungry beast.
336336
cpu: 4
337337
memory: 8Gb
@@ -340,10 +340,7 @@ freebsd_alt_build_task:
340340
- go version # Downloads a new go version based on go.mod's go directive.
341341
golint_cache:
342342
folder: ~/.cache/golangci-lint
343-
reupload_on_changes: true
344-
fingerprint_script:
345-
- go version
346-
- grep GOLANGCI_LINT_VERSION Makefile | head -1
343+
fingerprint_script: *golangci_cache_fingerprint
347344
lint_script:
348345
- gmake golangci-lint
349346
build_amd64_script:

0 commit comments

Comments
 (0)