1
0
mirror of https://github.com/goreleaser/goreleaser.git synced 2025-04-13 11:50:34 +02:00

feat: more go 1.18 (#2984)

* feat: more go 1.18

moved more workflows to go 1.18, switched some code to strings.Cut

Signed-off-by: Carlos A Becker <caarlos0@gmail.com>

* revert unwanted change
This commit is contained in:
Carlos Alexandro Becker 2022-03-16 23:28:13 -03:00 committed by GitHub
parent 1be9ede767
commit 077ce16174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 15 deletions

View File

@ -20,7 +20,7 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2
with:
go-version: 1.17
go-version: 1.18
- run: task docs:build
- uses: wjdp/htmltest-action@09118714cd26bef56bd3d0819e4f9b1dce6f60a9 # master
with:

View File

@ -19,7 +19,7 @@ jobs:
token: ${{ secrets.GH_PAT }}
- uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2
with:
go-version: 1.17
go-version: 1.18
- uses: arduino/setup-task@accf38bba955639d21816bb68775e5c48c482182 # v1
- run: task docs:generate
- run: task schema:generate

View File

@ -19,7 +19,7 @@ jobs:
steps:
- uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2
with:
go-version: ~1.17
go-version: ~1.18
- uses: actions/checkout@b0e28b5ac45a892f91e7d036f8200cf5ed489415 # v3
- name: golangci-lint
uses: golangci/golangci-lint-action@b517f99ae23d86ecc4c0dec08dcf48d2336abc29 # v3

View File

@ -249,10 +249,8 @@ func applyTemplate(ctx *context.Context, cfg config.SBOM, a *artifact.Artifact)
}
extraEnvs = append(extraEnvs, renderedKeyValue)
fields := strings.Split(renderedKeyValue, "=")
key := fields[0]
renderedValue := strings.Join(fields[1:], "=")
env[key] = renderedValue
k, v, _ := strings.Cut(renderedKeyValue, "=")
env[k] = v
}
var paths []string

View File

@ -763,9 +763,9 @@ func Test_templateNames(t *testing.T) {
actualEnv := make(map[string]string)
for _, str := range actualEnvs {
key := strings.Split(str, "=")[0]
value := strings.Join(strings.Split(str, "=")[1:], "=")
actualEnv[key] = value
k, v, ok := strings.Cut(str, "=")
require.True(t, ok)
actualEnv[k] = v
}
for k, v := range tt.expectedValues {

View File

@ -115,8 +115,8 @@ func New(ctx *context.Context) *Template {
func (t *Template) WithEnvS(envs []string) *Template {
result := map[string]string{}
for _, env := range envs {
parts := strings.SplitN(env, "=", 2)
result[parts[0]] = parts[1]
k, v, _ := strings.Cut(env, "=")
result[k] = v
}
return t.WithEnv(result)
}

View File

@ -148,11 +148,11 @@ func Wrap(ctx ctx.Context, config config.Project) *Context {
func ToEnv(env []string) Env {
r := Env{}
for _, e := range env {
p := strings.SplitN(e, "=", 2)
if len(p) != 2 || p[0] == "" {
k, v, ok := strings.Cut(e, "=")
if !ok || k == "" {
continue
}
r[p[0]] = p[1]
r[k] = v
}
return r
}