Merge branch 'release/1.1.0'
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
Andreas Mieke 2023-12-29 15:39:41 +01:00
commit e8904313fb
2 changed files with 6 additions and 8 deletions

View file

@ -7,9 +7,9 @@ steps:
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
registry: git.merp.digital
when:
- event: push
branch:
exclude: [develop, master]
- event: push
branch:
exclude: [develop, master]
publish-nightly:
image: woodpeckerci/plugin-docker-buildx
@ -17,7 +17,7 @@ steps:
repo: git.merp.digital/${CI_REPO_OWNER}/woodpecker-scp
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
registry: git.merp.digital
tags: ${CI_COMMIT_BRANCH}
tags: develop-${CI_COMMIT_SHA}
username: ${CI_REPO_OWNER}
password:
from_secret: cb_token
@ -31,9 +31,7 @@ steps:
repo: git.merp.digital/${CI_REPO_OWNER}/woodpecker-scp
platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x
registry: git.merp.digital
tags:
- latest
- ${CI_COMMIT_TAG}
tags: ${CI_COMMIT_TAG}
username: ${CI_REPO_OWNER}
password:
from_secret: cb_token

View file

@ -8,7 +8,7 @@ To use woodpecker-scp use the following entries in your `.woodpecker.yml`:
```yaml
publish:
image: git.merp.digital/eranmorkon/woodpecker-scp:latest
image: git.merp.digital/eranmorkon/woodpecker-scp:1.1.0
settings:
ssh_key:
from_secret: ssh_key