CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: Update go cache key to include go version (#13867)

This commit is contained in:
Joshua Powers 2023-09-05 13:42:42 -06:00 committed by GitHub
parent b39ea2e934
commit 9e960f40ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.circleci/config.yml
View File

@ -38,11 +38,14 @@ commands:
cache_version: cache_version:
type: string type: string
default: "v1" default: "v1"
goversion:
type: string
default: 1.21.0
steps: steps:
- check-changed-files-or-halt - check-changed-files-or-halt
- restore_cache: - restore_cache:
name: "Restore binaries from cache" name: "Restore binaries from cache"
key: << parameters.os >>-<< parameters.arch >>-go-bin-<< parameters.cache_version >>-{{ checksum "go.sum" }} key: << parameters.os >>-<< parameters.arch >>-go<< parameters.goversion >>-<< parameters.cache_version >>-{{ checksum "go.sum" }}
- when: - when:
condition: condition:
equal: [ linux, << parameters.os >> ] equal: [ linux, << parameters.os >> ]
@ -123,7 +126,7 @@ commands:
steps: steps:
- save_cache: - save_cache:
name: 'Saving binaries to cache' name: 'Saving binaries to cache'
key: << parameters.os >>-<< parameters.arch >>-go-bin-<< parameters.cache_version >>-{{ checksum "go.sum" }} key: << parameters.os >>-<< parameters.arch >>-go<< parameters.goversion >>-<< parameters.cache_version >>-{{ checksum "go.sum" }}
paths: paths:
- '/go/src/github.com/influxdata/telegraf/gotestsum' - '/go/src/github.com/influxdata/telegraf/gotestsum'
- when: - when:
@ -132,7 +135,7 @@ commands:
steps: steps:
- save_cache: - save_cache:
name: 'Saving binaries to cache' name: 'Saving binaries to cache'
key: << parameters.os >>-<< parameters.arch >>-go-bin-<< parameters.cache_version >>-{{ checksum "go.sum" }} key: << parameters.os >>-<< parameters.arch >>-go<< parameters.goversion >>-<< parameters.cache_version >>-{{ checksum "go.sum" }}
paths: paths:
- '~/go/src/github.com/influxdata/telegraf/gotestsum' - '~/go/src/github.com/influxdata/telegraf/gotestsum'
- '/usr/local/Cellar/go' - '/usr/local/Cellar/go'
@ -144,7 +147,7 @@ commands:
steps: steps:
- save_cache: - save_cache:
name: 'Saving binaries to cache' name: 'Saving binaries to cache'
key: << parameters.os >>-<< parameters.arch >>-go-bin-<< parameters.cache_version >>-{{ checksum "go.sum" }} key: << parameters.os >>-<< parameters.arch >>-go<< parameters.goversion >>-<< parameters.cache_version >>-{{ checksum "go.sum" }}
paths: paths:
- '~\project\gotestsum.exe' - '~\project\gotestsum.exe'
- 'C:\Program Files\Go' - 'C:\Program Files\Go'

5
tools/update_goversion/main.go
View File

@ -149,6 +149,11 @@ func main() {
Regex: `(quay\.io\/influxdb\/telegraf-ci):(\d.\d*.\d)`, Regex: `(quay\.io\/influxdb\/telegraf-ci):(\d.\d*.\d)`,
Replace: fmt.Sprintf("$1:%s", version), Replace: fmt.Sprintf("$1:%s", version),
}, },
{
FileName: ".circleci/config.yml",
Regex: `(default): "(\d.\d*.\d)"`,
Replace: fmt.Sprintf("$1: %s", version),
},
{ {
FileName: ".github/workflows/govulncheck.yml", FileName: ".github/workflows/govulncheck.yml",
Regex: `(go-version-input).*`, Regex: `(go-version-input).*`,