From b8891250aea92d4179c341acaed83b4a1ebcda36 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 2 Nov 2024 07:05:28 +0100
Subject: [PATCH 1/2] chore(deps): update docker.io/techknowlogick/xgo docker
 tag to go-1.23.x (#4282)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .woodpecker/binaries.yaml | 2 +-
 .woodpecker/docker.yaml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.woodpecker/binaries.yaml b/.woodpecker/binaries.yaml
index 71c4e3a9a..bf9b1dac2 100644
--- a/.woodpecker/binaries.yaml
+++ b/.woodpecker/binaries.yaml
@@ -7,7 +7,7 @@ when:
 variables:
   - &golang_image 'docker.io/golang:1.23'
   - &node_image 'docker.io/node:23-alpine'
-  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.x'
+  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.23.x'
 
 # cspell:words bindata netgo
 
diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml
index 1de41df35..3e94aff17 100644
--- a/.woodpecker/docker.yaml
+++ b/.woodpecker/docker.yaml
@@ -1,7 +1,7 @@
 variables:
   - &golang_image 'docker.io/golang:1.23'
   - &node_image 'docker.io/node:23-alpine'
-  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.x'
+  - &xgo_image 'docker.io/techknowlogick/xgo:go-1.23.x'
   - &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:5.0.0'
   - &platforms_release 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/amd64,linux/ppc64le,linux/riscv64,linux/s390x,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64'
   - &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64'

From 0b4654586f7130ba514b8c7b83531ae8112fd8e0 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sat, 2 Nov 2024 09:32:09 +0100
Subject: [PATCH 2/2] Add additionall error message on swagger v2 to v3 convert
 (#4254)

Co-authored-by: Anbraten <6918444+anbraten@users.noreply.github.com>
---
 cmd/server/woodpecker_docs_gen.go | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/cmd/server/woodpecker_docs_gen.go b/cmd/server/woodpecker_docs_gen.go
index 0ca776671..9c3eac261 100644
--- a/cmd/server/woodpecker_docs_gen.go
+++ b/cmd/server/woodpecker_docs_gen.go
@@ -24,6 +24,7 @@ package main
 import (
 	"context"
 	"encoding/json"
+	"fmt"
 	"os"
 	"path"
 
@@ -57,6 +58,7 @@ func main() {
 
 	// convert to OpenApi3
 	if err := toOpenApi3(filePath, filePath); err != nil {
+		fmt.Printf("converting '%s' from openapi v2 to v3 failed\n", filePath)
 		panic(err)
 	}
 }
@@ -77,18 +79,18 @@ func removeHost(jsonIn string) (string, error) {
 func toOpenApi3(input, output string) error {
 	data2, err := os.ReadFile(input)
 	if err != nil {
-		return err
+		return fmt.Errorf("read input: %w", err)
 	}
 
 	var doc2 openapi2.T
 	err = json.Unmarshal(data2, &doc2)
 	if err != nil {
-		return err
+		return fmt.Errorf("unmarshal input: %w", err)
 	}
 
 	doc3, err := openapi2conv.ToV3(&doc2)
 	if err != nil {
-		return err
+		return fmt.Errorf("convert openapi v2 to v3: %w", err)
 	}
 	err = doc3.Validate(context.Background())
 	if err != nil {
@@ -97,8 +99,12 @@ func toOpenApi3(input, output string) error {
 
 	data, err := json.Marshal(doc3)
 	if err != nil {
-		return err
+		return fmt.Errorf("Marshal converted: %w", err)
 	}
 
-	return os.WriteFile(output, data, 0o644)
+	if err = os.WriteFile(output, data, 0o644); err != nil {
+		return fmt.Errorf("write output: %w", err)
+	}
+
+	return nil
 }