diff --git a/.woodpecker/static.yaml b/.woodpecker/static.yaml index 17b9f0e9f..000d2e25d 100644 --- a/.woodpecker/static.yaml +++ b/.woodpecker/static.yaml @@ -26,7 +26,7 @@ steps: image: docker.io/woodpeckerci/plugin-prettier:0.1.0 depends_on: [] settings: - version: 3.2.5 + version: 3.3.3 - name: links image: docker.io/lycheeverse/lychee:0.15.1 diff --git a/cmd/server/flags.go b/cmd/server/flags.go index a1fc44c7c..45c905a4f 100644 --- a/cmd/server/flags.go +++ b/cmd/server/flags.go @@ -477,7 +477,7 @@ var flags = append([]cli.Flag{ // expert flags // &cli.StringFlag{ - Sources: cli.EnvVars("WOODPECKER_EXPERT_WEBHOOK_HOST", "WOODPECKER_WEBHOOK_HOST"), // TODO: remove WOODPECKER_WEBHOOK_HOST in next major release + Sources: cli.EnvVars("WOODPECKER_EXPERT_WEBHOOK_HOST"), Name: "server-webhook-host", Usage: "!!!for experts!!! fully qualified woodpecker server url called by forge's webhooks. Format: ://[/]", }, diff --git a/docs/docs/20-usage/10-intro.md b/docs/docs/20-usage/10-intro.md index 87951bdd8..1c4baec1f 100644 --- a/docs/docs/20-usage/10-intro.md +++ b/docs/docs/20-usage/10-intro.md @@ -86,16 +86,17 @@ Sometimes you have some tasks that you need to do in every project. For example, If you want to get a Slack notification after your pipeline has finished, you can add a Slack plugin to your pipeline: ```yaml ---- -- name: notify me on Slack - image: plugins/slack - settings: - channel: developers - username: woodpecker - password: - from_secret: slack_token - when: - status: [success, failure] # This will execute the step on success and failure +steps: + # ... + - name: notify me on Slack + image: plugins/slack + settings: + channel: developers + username: woodpecker + password: + from_secret: slack_token + when: + status: [success, failure] # This will execute the step on success and failure ``` To configure a plugin you can use the `settings` section. diff --git a/docs/docs/20-usage/20-workflow-syntax.md b/docs/docs/20-usage/20-workflow-syntax.md index 4e481e429..d50345e6a 100644 --- a/docs/docs/20-usage/20-workflow-syntax.md +++ b/docs/docs/20-usage/20-workflow-syntax.md @@ -104,7 +104,7 @@ When using the `local` backend, the `image` entry is used to specify the shell, - go test - name: publish -+ image: plugins/docker ++ image: woodpeckerci/plugin-docker-buildx repo: foo/bar services: @@ -475,7 +475,7 @@ Normally steps of a workflow are executed serially in the order in which they ar - go build - name: deploy - image: plugins/docker + image: woodpeckerci/plugin-docker-buildx settings: repo: foo/bar + depends_on: [build, test] # deploy will be executed after build and test finished diff --git a/docs/docs/20-usage/50-environment.md b/docs/docs/20-usage/50-environment.md index 299bb8f53..7a366d9d3 100644 --- a/docs/docs/20-usage/50-environment.md +++ b/docs/docs/20-usage/50-environment.md @@ -172,7 +172,7 @@ Example commit substitution: ```diff steps: - name: docker - image: plugins/docker + image: woodpeckerci/plugin-docker-buildx settings: + tags: ${CI_COMMIT_SHA} ``` @@ -182,7 +182,7 @@ Example tag substitution: ```diff steps: - name: docker - image: plugins/docker + image: woodpeckerci/plugin-docker-buildx settings: + tags: ${CI_COMMIT_TAG} ``` @@ -210,7 +210,7 @@ Example variable substitution with substring: ```diff steps: - name: docker - image: plugins/docker + image: woodpeckerci/plugin-docker-buildx settings: + tags: ${CI_COMMIT_SHA:0:8} ``` @@ -220,7 +220,7 @@ Example variable substitution strips `v` prefix from `v.1.0.0`: ```diff steps: - name: docker - image: plugins/docker + image: woodpeckerci/plugin-docker-buildx settings: + tags: ${CI_COMMIT_TAG##v} ``` diff --git a/docs/docs/20-usage/51-plugins/51-overview.md b/docs/docs/20-usage/51-plugins/51-overview.md index 6213d5d27..93a5d27f4 100644 --- a/docs/docs/20-usage/51-plugins/51-overview.md +++ b/docs/docs/20-usage/51-plugins/51-overview.md @@ -34,7 +34,7 @@ steps: - go test - name: publish - image: plugins/docker + image: woodpeckerci/plugin-docker-buildx settings: repo: foo/bar tags: latest diff --git a/docs/docs/30-administration/10-server-config.md b/docs/docs/30-administration/10-server-config.md index 6e7e450a5..ed624bf6e 100644 --- a/docs/docs/30-administration/10-server-config.md +++ b/docs/docs/30-administration/10-server-config.md @@ -197,14 +197,6 @@ Examples: - `WOODPECKER_HOST=http://example.org/woodpecker` - `WOODPECKER_HOST=http://example.org:1234/woodpecker` -### `WOODPECKER_WEBHOOK_HOST` - -> Default: value from `WOODPECKER_HOST` config env - -Server fully qualified URL of the Webhook-facing hostname and path prefix. - -Example: `WOODPECKER_WEBHOOK_HOST=http://woodpecker-server.cicd.svc.cluster.local:8000` - ### `WOODPECKER_SERVER_ADDR` > Default: `:8000` diff --git a/docs/docs/30-administration/11-forges/30-gitea.md b/docs/docs/30-administration/11-forges/30-gitea.md index 23cd6849a..62fe40cb6 100644 --- a/docs/docs/30-administration/11-forges/30-gitea.md +++ b/docs/docs/30-administration/11-forges/30-gitea.md @@ -97,11 +97,3 @@ Read the value for `WOODPECKER_GITEA_SECRET` from the specified filepath > Default: `false` Configure if SSL verification should be skipped. - -## Advanced options - -### `WOODPECKER_DEV_GITEA_OAUTH_URL` - -> Default: value of `WOODPECKER_GITEA_URL` - -Configures the user-facing Gitea server address. Should be used if `WOODPECKER_GITEA_URL` points to an internal URL used for API requests. diff --git a/docs/docs/30-administration/11-forges/35-forgejo.md b/docs/docs/30-administration/11-forges/35-forgejo.md index b70c243f0..5b89d8051 100644 --- a/docs/docs/30-administration/11-forges/35-forgejo.md +++ b/docs/docs/30-administration/11-forges/35-forgejo.md @@ -4,10 +4,6 @@ toc_max_heading_level: 2 # Forgejo -:::warning -Forgejo support is experimental. -::: - Woodpecker comes with built-in support for Forgejo. To enable Forgejo you should configure the Woodpecker container using the following environment variables: ```ini diff --git a/docs/docs/91-migrations.md b/docs/docs/91-migrations.md index 42528ce25..5bd8db9ac 100644 --- a/docs/docs/91-migrations.md +++ b/docs/docs/91-migrations.md @@ -21,7 +21,7 @@ Some versions need some changes to the server configuration or the pipeline conf - Deprecated alternative names for secrets, use `environment` with `from_secret` - Deprecated slice definition for env vars - Deprecated `environment` filter, use `when.evaluate` -- Deprecated `WOODPECKER_WEBHOOK_HOST` in favor of `WOODPECKER_EXPERT_WEBHOOK_HOST` +- Removed `WOODPECKER_WEBHOOK_HOST` in favor of `WOODPECKER_EXPERT_WEBHOOK_HOST` - Migrated to rfc9421 for webhook signatures ## 2.0.0 diff --git a/docs/docs/92-development/01-getting-started.md b/docs/docs/92-development/01-getting-started.md index c4aef640d..20ee99255 100644 --- a/docs/docs/92-development/01-getting-started.md +++ b/docs/docs/92-development/01-getting-started.md @@ -54,8 +54,7 @@ A common config for debugging would look like this: WOODPECKER_OPEN=true WOODPECKER_ADMIN=your-username -# if you want to test webhooks with an online forge like GitHub this address needs to be accessible from public server -WOODPECKER_HOST=http://your-dev-address.com +WOODPECKER_HOST=http://localhost:8000 # github (sample for a forge config - see /docs/administration/forge/overview for other forges) WOODPECKER_GITHUB=true @@ -70,8 +69,8 @@ WOODPECKER_MAX_WORKFLOWS=1 # enable if you want to develop the UI # WOODPECKER_DEV_WWW_PROXY=http://localhost:8010 -# used so you can login without using a public address -WOODPECKER_DEV_OAUTH_HOST=http://localhost:8000 +# if you want to test webhooks with an online forge like GitHub this address needs to be set and accessible from public server +WOODPECKER_EXPERT_WEBHOOK_HOST=http://your-address.com # disable health-checks while debugging (normally not needed while developing) WOODPECKER_HEALTHCHECK=false diff --git a/pipeline/frontend/yaml/linter/schema/.woodpecker/test-array-syntax.yaml b/pipeline/frontend/yaml/linter/schema/.woodpecker/test-array-syntax.yaml index a21b77261..569e5529c 100644 --- a/pipeline/frontend/yaml/linter/schema/.woodpecker/test-array-syntax.yaml +++ b/pipeline/frontend/yaml/linter/schema/.woodpecker/test-array-syntax.yaml @@ -1,5 +1,3 @@ -version: 1 - clone: - name: git image: woodpeckerci/plugin-git