mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-06-05 17:08:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'origin/main' into 'next-release/main'

Browse source
This commit is contained in:
oauth 2024-11-02 15:38:29 +00:00
commit cc55386e02
3 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.woodpecker/binaries.yaml
View file

@ -7,7 +7,7 @@ when:
variables: variables:
- &golang_image 'docker.io/golang:1.23' - &golang_image 'docker.io/golang:1.23'
- &node_image 'docker.io/node:23-alpine' - &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 # cspell:words bindata netgo

2
.woodpecker/docker.yaml
View file

@ -1,7 +1,7 @@
variables: variables:
- &golang_image 'docker.io/golang:1.23' - &golang_image 'docker.io/golang:1.23'
- &node_image 'docker.io/node:23-alpine' - &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' - &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_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' - &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64'

16
cmd/server/woodpecker_docs_gen.go
View file

@ -24,6 +24,7 @@ package main
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"os" "os"
"path" "path"
@ -57,6 +58,7 @@ func main() {
// convert to OpenApi3 // convert to OpenApi3
if err := toOpenApi3(filePath, filePath); err != nil { if err := toOpenApi3(filePath, filePath); err != nil {
fmt.Printf("converting '%s' from openapi v2 to v3 failed\n", filePath)
panic(err) panic(err)
} }
} }
@ -77,18 +79,18 @@ func removeHost(jsonIn string) (string, error) {
func toOpenApi3(input, output string) error { func toOpenApi3(input, output string) error {
data2, err := os.ReadFile(input) data2, err := os.ReadFile(input)
if err != nil { if err != nil {
return err return fmt.Errorf("read input: %w", err)
} }
var doc2 openapi2.T var doc2 openapi2.T
err = json.Unmarshal(data2, &doc2) err = json.Unmarshal(data2, &doc2)
if err != nil { if err != nil {
return err return fmt.Errorf("unmarshal input: %w", err)
} }
doc3, err := openapi2conv.ToV3(&doc2) doc3, err := openapi2conv.ToV3(&doc2)
if err != nil { if err != nil {
return err return fmt.Errorf("convert openapi v2 to v3: %w", err)
} }
err = doc3.Validate(context.Background()) err = doc3.Validate(context.Background())
if err != nil { if err != nil {
@ -97,8 +99,12 @@ func toOpenApi3(input, output string) error {
data, err := json.Marshal(doc3) data, err := json.Marshal(doc3)
if err != nil { 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
} }