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] 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