chore: fix static check

This commit is contained in:
Robert Kaussow 2021-01-10 23:53:07 +01:00
parent 89b0b6823a
commit 6053ba4888
Signed by: xoxys
GPG Key ID: 65362AE74AF98B61
3 changed files with 22 additions and 22 deletions

View File

@ -67,7 +67,7 @@ local PipelineTest = {
}, },
], ],
trigger: { trigger: {
ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
}, },
}; };
@ -137,7 +137,7 @@ local PipelineBuildBinaries = {
'test', 'test',
], ],
trigger: { trigger: {
ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
}, },
}; };
@ -187,7 +187,7 @@ local PipelineBuildContainer(arch='amd64') = {
password: { from_secret: 'docker_password' }, password: { from_secret: 'docker_password' },
}, },
when: { when: {
ref: ['refs/heads/master', 'refs/tags/**'], ref: ['refs/heads/main', 'refs/tags/**'],
}, },
depends_on: ['dryrun'], depends_on: ['dryrun'],
}, },
@ -205,7 +205,7 @@ local PipelineBuildContainer(arch='amd64') = {
password: { from_secret: 'quay_password' }, password: { from_secret: 'quay_password' },
}, },
when: { when: {
ref: ['refs/heads/master', 'refs/tags/**'], ref: ['refs/heads/main', 'refs/tags/**'],
}, },
depends_on: ['dryrun'], depends_on: ['dryrun'],
}, },
@ -214,7 +214,7 @@ local PipelineBuildContainer(arch='amd64') = {
'test', 'test',
], ],
trigger: { trigger: {
ref: ['refs/heads/master', 'refs/tags/**', 'refs/pull/**'], ref: ['refs/heads/main', 'refs/tags/**', 'refs/pull/**'],
}, },
}; };
@ -309,7 +309,7 @@ local PipelineNotifications = {
'build-container-arm64', 'build-container-arm64',
], ],
trigger: { trigger: {
ref: ['refs/heads/master', 'refs/tags/**'], ref: ['refs/heads/main', 'refs/tags/**'],
status: ['success', 'failure'], status: ['success', 'failure'],
}, },
}; };

View File

@ -48,7 +48,7 @@ image_pull_secrets:
trigger: trigger:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
- refs/pull/** - refs/pull/**
@ -105,7 +105,7 @@ image_pull_secrets:
trigger: trigger:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
- refs/pull/** - refs/pull/**
@ -160,7 +160,7 @@ steps:
from_secret: docker_username from_secret: docker_username
when: when:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
depends_on: depends_on:
- dryrun - dryrun
@ -181,7 +181,7 @@ steps:
from_secret: quay_username from_secret: quay_username
when: when:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
depends_on: depends_on:
- dryrun - dryrun
@ -191,7 +191,7 @@ image_pull_secrets:
trigger: trigger:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
- refs/pull/** - refs/pull/**
@ -246,7 +246,7 @@ steps:
from_secret: docker_username from_secret: docker_username
when: when:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
depends_on: depends_on:
- dryrun - dryrun
@ -267,7 +267,7 @@ steps:
from_secret: quay_username from_secret: quay_username
when: when:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
depends_on: depends_on:
- dryrun - dryrun
@ -277,7 +277,7 @@ image_pull_secrets:
trigger: trigger:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
- refs/pull/** - refs/pull/**
@ -332,7 +332,7 @@ steps:
from_secret: docker_username from_secret: docker_username
when: when:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
depends_on: depends_on:
- dryrun - dryrun
@ -353,7 +353,7 @@ steps:
from_secret: quay_username from_secret: quay_username
when: when:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
depends_on: depends_on:
- dryrun - dryrun
@ -363,7 +363,7 @@ image_pull_secrets:
trigger: trigger:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
- refs/pull/** - refs/pull/**
@ -454,7 +454,7 @@ image_pull_secrets:
trigger: trigger:
ref: ref:
- refs/heads/master - refs/heads/main
- refs/tags/** - refs/tags/**
status: status:
- success - success
@ -468,6 +468,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: 39198ae608d35d3f8b0a0a69ac66243cf31ccc4b0303b39a64b61ff738daa292 hmac: 9ea1cc8a26d1c759eaf152bbc28abe6ec479310d6081bab4c27baefa5e2d4145
... ...

View File

@ -93,7 +93,7 @@ func (p Plugin) Exec() error {
path := filepath.Join(dockerHome, "config.json") path := filepath.Join(dockerHome, "config.json")
err := ioutil.WriteFile(path, []byte(p.Login.Config), 0600) err := ioutil.WriteFile(path, []byte(p.Login.Config), 0600)
if err != nil { if err != nil {
return fmt.Errorf("Error writing config.json: %s", err) return fmt.Errorf("error writing config.json: %s", err)
} }
} }
@ -102,7 +102,7 @@ func (p Plugin) Exec() error {
cmd := commandLogin(p.Login) cmd := commandLogin(p.Login)
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
return fmt.Errorf("Error authenticating: %s", err) return fmt.Errorf("error authenticating: %s", err)
} }
} }
@ -139,7 +139,7 @@ func (p Plugin) Exec() error {
for _, tag := range p.Build.Tags { for _, tag := range p.Build.Tags {
cmds = append(cmds, commandTag(p.Build, tag)) // docker tag cmds = append(cmds, commandTag(p.Build, tag)) // docker tag
if p.Dryrun == false { if !p.Dryrun {
cmds = append(cmds, commandPush(p.Build, tag)) // docker push cmds = append(cmds, commandPush(p.Build, tag)) // docker push
} }
} }