From b4055e8c1087f608793ab92cacc4ef45f310f978 Mon Sep 17 00:00:00 2001
From: Patrick Schratz <patrick.schratz@gmail.com>
Date: Fri, 27 Dec 2024 10:02:27 +0100
Subject: [PATCH 1/2] Reduce PR preview images (#4623)

---
 .woodpecker/docker.yaml | 37 ++++++-------------------------------
 .woodpecker/test.yaml   |  2 +-
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index 0363b4693..d5b164496 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -119,20 +119,6 @@ steps:
       event: [push, tag]
       path: *when_path
 
-  publish-server-preview:
-    depends_on:
-      - cross-compile-server-preview
-    image: *buildx_plugin
-    settings:
-      repo: woodpeckerci/woodpecker-server
-      dockerfile: docker/Dockerfile.server.multiarch
-      platforms: *platforms_preview
-      tag: pull_${CI_COMMIT_PULL_REQUEST}
-      logins: *publish_logins
-    when: &when-preview
-      evaluate: 'CI_COMMIT_PULL_REQUEST_LABELS contains "build_pr_images"'
-      event: pull_request
-
   publish-server-alpine-preview:
     depends_on:
       - cross-compile-server-preview
@@ -143,7 +129,9 @@ steps:
       platforms: *platforms_preview
       tag: pull_${CI_COMMIT_PULL_REQUEST}-alpine
       logins: *publish_logins
-    when: *when-preview
+    when: &when-preview
+      evaluate: 'CI_COMMIT_PULL_REQUEST_LABELS contains "build_pr_images"'
+      event: pull_request
 
   build-server-dryrun:
     depends_on:
@@ -218,15 +206,15 @@ steps:
   # A g e n t #
   #############
 
-  publish-agent-preview:
+  publish-agent-preview-alpine:
     depends_on:
       - vendor
     image: *buildx_plugin
     settings:
       repo: woodpeckerci/woodpecker-agent
-      dockerfile: docker/Dockerfile.agent.multiarch
+      dockerfile: docker/Dockerfile.agent.alpine.multiarch
       platforms: *platforms_preview
-      tag: pull_${CI_COMMIT_PULL_REQUEST}
+      tag: pull_${CI_COMMIT_PULL_REQUEST}-alpine
       build_args: *build_args
       logins: *publish_logins
     when: *when-preview
@@ -315,19 +303,6 @@ steps:
   # C L I #
   #########
 
-  publish-cli-preview:
-    depends_on:
-      - vendor
-    image: *buildx_plugin
-    settings:
-      repo: woodpeckerci/woodpecker-cli
-      dockerfile: docker/Dockerfile.cli.multiarch
-      platforms: *platforms_preview
-      tag: pull_${CI_COMMIT_PULL_REQUEST}
-      build_args: *build_args
-      logins: *publish_logins
-    when: *when-preview
-
   build-cli-dryrun:
     depends_on:
       - vendor
diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml
index 0ca998b44..724f7a71b 100644
--- a/.woodpecker/test.yaml
+++ b/.woodpecker/test.yaml
@@ -32,7 +32,7 @@ steps:
       - vendor
     image: *golang_image
     commands:
-      - go run go.woodpecker-ci.org/woodpecker/v2/cmd/cli lint
+      - go run go.woodpecker-ci.org/woodpecker/v3/cmd/cli lint
     environment:
       WOODPECKER_DISABLE_UPDATE_CHECK: true
       WOODPECKER_LINT_STRICT: true

From 147de3c73da9123524e94ce2e3e0217e60562bae Mon Sep 17 00:00:00 2001
From: Kerim Incedayi <k@kerim.me>
Date: Fri, 27 Dec 2024 15:51:59 +0100
Subject: [PATCH 2/2] fix typo (#4621)

---
 .../version-2.8/30-administration/00-getting-started.md         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/versioned_docs/version-2.8/30-administration/00-getting-started.md b/docs/versioned_docs/version-2.8/30-administration/00-getting-started.md
index f7a6094e0..8bb1b0a71 100644
--- a/docs/versioned_docs/version-2.8/30-administration/00-getting-started.md
+++ b/docs/versioned_docs/version-2.8/30-administration/00-getting-started.md
@@ -45,7 +45,7 @@ By default Woodpecker uses a SQLite database which requires zero installation or
 
 ## Forge
 
-What would be a CI/CD system without any code? By connecting Woodpecker to your [forge](../20-usage/15-terminology/index.md) like GitHub or Gitea you can start running pipelines on events like pushes or pull requests. Woodpecker will also use your forge for authentication and to report back the status of your pipelines. See the [forge settings](./11-forges/11-overview.md) to conntect it to Woodpecker.
+What would be a CI/CD system without any code? By connecting Woodpecker to your [forge](../20-usage/15-terminology/index.md) like GitHub or Gitea you can start running pipelines on events like pushes or pull requests. Woodpecker will also use your forge for authentication and to report back the status of your pipelines. See the [forge settings](./11-forges/11-overview.md) to connect it to Woodpecker.
 
 ## Configuration