Skip to content

Commit 3d175de

Browse files
authored
Merge branch 'main' into aquire_DB_lock_for_CreatePipeline
2 parents 3751e5b + 0f71f68 commit 3d175de

File tree

623 files changed

+21324
-33264
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

623 files changed

+21324
-33264
lines changed

.cspell.json

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@
2828
"Bluesky",
2929
"Boguslawski",
3030
"bradrydzewski",
31+
"buildkit",
3132
"BUILDPLATFORM",
3233
"buildx",
33-
"buildkit",
3434
"caddyfile",
3535
"ccmenu",
3636
"CERTDIR",
3737
"certmagic",
3838
"charmbracelet",
39+
"checkmake",
3940
"cicd",
4041
"ciphertext",
4142
"Cloudron",
@@ -48,6 +49,7 @@
4849
"datacenter",
4950
"DATASOURCE",
5051
"Debugf",
52+
"dejavusans",
5153
"Demilestoned",
5254
"desaturate",
5355
"devx",
@@ -119,15 +121,16 @@
119121
"mapstructure",
120122
"markdownlint",
121123
"mdbook",
122-
"Milestoned",
123124
"memswap",
124125
"Metas",
125126
"mhmxs",
127+
"Milestoned",
126128
"moby",
127129
"Msgf",
128130
"mstruebing",
129131
"multiarch",
130132
"multierr",
133+
"narqo",
131134
"netdns",
132135
"Netrc",
133136
"Nextcloud",
@@ -173,7 +176,6 @@
173176
"Rydzewski",
174177
"seccomp",
175178
"secprofile",
176-
"securecookie",
177179
"selfhosted",
178180
"sess",
179181
"shellescape",
@@ -210,6 +212,7 @@
210212
"Upsert",
211213
"urfave",
212214
"usecase",
215+
"useragent",
213216
"varchar",
214217
"varz",
215218
"Vieter",
@@ -238,32 +241,33 @@
238241
"zerologger"
239242
],
240243
"ignorePaths": [
241-
"*.excalidraw",
242-
"*.svg",
243-
"*_test.go",
244244
".cspell.json",
245245
".git/**/*",
246246
".gitignore",
247247
".golangci.yaml",
248248
".vscode/extensions.json",
249+
"*_test.go",
250+
"*.excalidraw",
251+
"*.svg",
252+
"**/*.pb.go",
253+
"**/fixtures/**",
254+
"**/testdata/**",
249255
"CHANGELOG.md",
250-
"Makefile",
256+
"docs/versioned_docs/",
251257
"flake.nix",
252258
"go.mod",
253-
"**/*.pb.go",
259+
"Makefile",
260+
"package.json",
254261
"server/store/datastore/migration/**/*",
255262
"web/components.d.ts",
256263
"web/src/assets/locales/**/*",
257-
"**/fixtures/**",
258-
"**/testdata/**",
259-
"docs/versioned_docs/",
260-
"package.json",
261264
// generated
262-
"go.sum",
263-
"flake.lock",
264-
"pnpm-lock.yaml",
265+
"**/mocks/**",
265266
"**/node_modules/**/*",
266267
"cmd/server/openapi/docs.go",
268+
"flake.lock",
269+
"go.sum",
270+
"pnpm-lock.yaml",
267271
"renovate.json",
268272
// TODO: remove the following
269273
"docs/**/*.js",

.ecrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"LICENSE",
99
"node_modules",
1010
"server/store/datastore/migration/test-files/sqlite.db",
11+
"server/store/datastore/migration/test-files/postgres.sql",
1112
"server/store/datastore/feed.go",
1213
"cmd/server/openapi/docs.go",
1314
"_test.go",

.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ tasks:
1010
WOODPECKER_BACKEND_DOCKER_NETWORK: ci_default
1111
init: |
1212
# renovate: datasource=golang-version depName=golang
13-
GO_VERSION=1.25.1
13+
GO_VERSION=1.25.6
1414
rm -rf ~/go
1515
curl -fsSL https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz | tar xzs -C ~/
1616
go mod tidy

.golangci.yaml

Lines changed: 34 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ linters:
4949
agent:
5050
list-mode: lax
5151
files:
52-
- '**/agent/**/*.go'
5352
- '**/agent/*.go'
54-
- '**/cmd/agent/**/*.go'
53+
- '**/agent/**/*.go'
5554
- '**/cmd/agent/*.go'
55+
- '**/cmd/agent/**/*.go'
5656
deny:
5757
- pkg: go.woodpecker-ci.org/woodpecker/v3/cli
5858
- pkg: go.woodpecker-ci.org/woodpecker/v3/cmd/cli
@@ -63,70 +63,89 @@ linters:
6363
cli:
6464
list-mode: lax
6565
files:
66-
- '**/cli/**/*.go'
6766
- '**/cli/*.go'
68-
- '**/cmd/cli/**/*.go'
67+
- '**/cli/**/*.go'
6968
- '**/cmd/cli/*.go'
69+
- '**/cmd/cli/**/*.go'
7070
deny:
7171
- pkg: go.woodpecker-ci.org/woodpecker/v3/agent
72-
- pkg: go.woodpecker-ci.org/woodpecker/v3/server
7372
- pkg: go.woodpecker-ci.org/woodpecker/v3/cmd/agent
7473
- pkg: go.woodpecker-ci.org/woodpecker/v3/cmd/server
74+
- pkg: go.woodpecker-ci.org/woodpecker/v3/rpc
75+
- pkg: go.woodpecker-ci.org/woodpecker/v3/server
7576
- pkg: go.woodpecker-ci.org/woodpecker/v3/web
7677
pipeline:
7778
list-mode: lax
7879
files:
79-
- '**/pipeline/**/*.go'
80-
- '**/pipeline/*.go'
8180
- '!**/cli/pipeline/*.go'
8281
- '!**/cli/pipeline/**/*.go'
8382
- '!**/server/pipeline/*.go'
8483
- '!**/server/pipeline/**/*.go'
84+
- '**/pipeline/*.go'
85+
- '**/pipeline/**/*.go'
8586
deny:
8687
- pkg: go.woodpecker-ci.org/woodpecker/v3/agent
8788
- pkg: go.woodpecker-ci.org/woodpecker/v3/cli
8889
- pkg: go.woodpecker-ci.org/woodpecker/v3/cmd
90+
- pkg: go.woodpecker-ci.org/woodpecker/v3/rpc
8991
- pkg: go.woodpecker-ci.org/woodpecker/v3/server
9092
- pkg: go.woodpecker-ci.org/woodpecker/v3/web
9193
server:
9294
list-mode: lax
9395
files:
94-
- '**/server/**/*.go'
95-
- '**/server/*.go'
96-
- '**/cmd/server/**/*.go'
9796
- '**/cmd/server/*.go'
98-
- '**/web/**/*.go'
97+
- '**/cmd/server/**/*.go'
98+
- '**/server/*.go'
99+
- '**/server/**/*.go'
99100
- '**/web/*.go'
101+
- '**/web/**/*.go'
100102
deny:
101103
- pkg: go.woodpecker-ci.org/woodpecker/v3/agent
102104
- pkg: go.woodpecker-ci.org/woodpecker/v3/cli
103105
- pkg: go.woodpecker-ci.org/woodpecker/v3/cmd/agent
104106
- pkg: go.woodpecker-ci.org/woodpecker/v3/cmd/cli
105107
- pkg: go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker
108+
rpc:
109+
list-mode: lax
110+
files:
111+
- '!**/agent/rpc/*.go'
112+
- '!**/agent/rpc/**/*.go'
113+
- '!**/server/rpc/*.go'
114+
- '!**/server/rpc/**/*.go'
115+
- '**/rpc/*.go'
116+
- '**/rpc/**/*.go'
117+
deny:
118+
- pkg: go.woodpecker-ci.org/woodpecker/v3/agent
119+
- pkg: go.woodpecker-ci.org/woodpecker/v3/cli
120+
- pkg: go.woodpecker-ci.org/woodpecker/v3/cmd
121+
- pkg: go.woodpecker-ci.org/woodpecker/v3/server
122+
- pkg: go.woodpecker-ci.org/woodpecker/v3/web
106123
shared:
107124
list-mode: lax
108125
files:
109-
- '**/shared/**/*.go'
110-
- '**/shared/*.go'
111126
- '!**/pipeline/shared/*.go'
112127
- '!**/pipeline/shared/**/*.go'
128+
- '**/shared/*.go'
129+
- '**/shared/**/*.go'
113130
deny:
114131
- pkg: go.woodpecker-ci.org/woodpecker/v3/agent
115132
- pkg: go.woodpecker-ci.org/woodpecker/v3/cli
116133
- pkg: go.woodpecker-ci.org/woodpecker/v3/cmd
117134
- pkg: go.woodpecker-ci.org/woodpecker/v3/pipeline
135+
- pkg: go.woodpecker-ci.org/woodpecker/v3/rpc
118136
- pkg: go.woodpecker-ci.org/woodpecker/v3/server
119137
- pkg: go.woodpecker-ci.org/woodpecker/v3/web
120138
woodpecker-go:
121139
list-mode: lax
122140
files:
123-
- '**/woodpecker-go/woodpecker/**/*.go'
124141
- '**/woodpecker-go/woodpecker/*.go'
142+
- '**/woodpecker-go/woodpecker/**/*.go'
125143
deny:
126144
- pkg: go.woodpecker-ci.org/woodpecker/v3/agent
127145
- pkg: go.woodpecker-ci.org/woodpecker/v3/cli
128146
- pkg: go.woodpecker-ci.org/woodpecker/v3/cmd
129147
- pkg: go.woodpecker-ci.org/woodpecker/v3/pipeline
148+
- pkg: go.woodpecker-ci.org/woodpecker/v3/rpc
130149
- pkg: go.woodpecker-ci.org/woodpecker/v3/server
131150
- pkg: go.woodpecker-ci.org/woodpecker/v3/shared
132151
- pkg: go.woodpecker-ci.org/woodpecker/v3/web
@@ -159,7 +178,7 @@ linters:
159178
- time.*
160179
- strings.Split
161180
- callerName
162-
- securecookie.GenerateRandomKey
181+
- random.GetRandomBytes
163182
revive:
164183
rules:
165184
- name: var-naming

.mockery.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ filename: mock_{{.InterfaceName}}.go
55
pkgname: mocks
66
recursive: true
77
packages:
8-
go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc:
8+
go.woodpecker-ci.org/woodpecker/v3/rpc:
99
config:
1010
recursive: false
1111
go.woodpecker-ci.org/woodpecker/v3/server/forge:

.pre-commit-config.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ repos:
88
rev: v6.0.0
99
hooks:
1010
- id: end-of-file-fixer
11+
exclude: '\.sql$'
1112
- id: trailing-whitespace
1213
exclude: ^docs/versioned_docs/.+/40-cli.md$
1314
- repo: https://github.com/golangci/golangci-lint
14-
rev: v2.5.0
15+
rev: v2.8.0
1516
hooks:
1617
- id: golangci-lint
1718
- repo: https://github.com/igorshubovych/markdownlint-cli
18-
rev: v0.45.0
19+
rev: v0.47.0
1920
hooks:
2021
- id: markdownlint
2122
exclude: '^(docs/versioned_docs/.*|CHANGELOG.md)$'
2223
language_version: 22.15.1
2324
- repo: https://github.com/mrtazz/checkmake
24-
rev: 0.2.2
25+
rev: v0.3.2
2526
hooks:
2627
- id: checkmake
2728
exclude: '^docker/Dockerfile.make$' # actually a Dockerfile and not a makefile
@@ -30,11 +31,11 @@ repos:
3031
hooks:
3132
- id: hadolint
3233
- repo: https://github.com/rbubley/mirrors-prettier
33-
rev: v3.6.2
34+
rev: v3.8.1
3435
hooks:
3536
- id: prettier
3637
- repo: https://github.com/adrienverge/yamllint.git
37-
rev: v1.37.1
38+
rev: v1.38.0
3839
hooks:
3940
- id: yamllint
4041
args: [--strict, -c=.yamllint.yaml]

.woodpecker/binaries.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ when:
88

99
variables:
1010
- &golang_image 'docker.io/golang:1.25'
11-
- &node_image 'docker.io/node:23-alpine'
11+
- &node_image 'docker.io/node:24-alpine'
1212
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.25.x'
1313

1414
# cspell:words bindata netgo
@@ -38,7 +38,7 @@ steps:
3838
- apt install -y tree
3939
- make cross-compile-server
4040
environment:
41-
PLATFORMS: linux|arm64/v8;linux|amd64;windows|amd64
41+
PLATFORMS: linux|arm64/v8;linux|amd64;linux|riscv64;windows|amd64
4242
TAGS: bindata sqlite sqlite_unlock_notify netgo
4343
ARCHIVE_IT: '1'
4444

@@ -99,7 +99,7 @@ steps:
9999
release:
100100
depends_on:
101101
- checksums
102-
image: woodpeckerci/plugin-release:0.2.5
102+
image: woodpeckerci/plugin-release:0.2.6
103103
settings:
104104
api_key:
105105
from_secret: github_token

.woodpecker/docker.yaml

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
variables:
22
- &golang_image 'docker.io/golang:1.25'
3-
- &node_image 'docker.io/node:23-alpine'
3+
- &node_image 'docker.io/node:24-alpine'
44
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.25.x'
5-
- &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:6.0.3'
5+
- &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:6.0.4'
66
- &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'
77
- &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64'
88
- &platforms_preview 'linux/amd64'
@@ -44,6 +44,8 @@ when:
4444
- event: push
4545
branch: ${CI_REPO_DEFAULT_BRANCH}
4646
path: *when_path
47+
- event: pull_request_metadata
48+
evaluate: 'CI_COMMIT_PULL_REQUEST_LABELS contains "build_pr_images"'
4749

4850
steps:
4951
vendor:
@@ -52,7 +54,7 @@ steps:
5254
commands:
5355
- go mod vendor
5456
when:
55-
- event: pull_request
57+
- event: [pull_request, pull_request_metadata]
5658
evaluate: 'CI_COMMIT_PULL_REQUEST_LABELS contains "build_pr_images"'
5759
- event: pull_request
5860
path: *when_path
@@ -72,7 +74,7 @@ steps:
7274
- pnpm install --frozen-lockfile
7375
- pnpm build
7476
when:
75-
- event: pull_request
77+
- event: [pull_request, pull_request_metadata]
7678
evaluate: 'CI_COMMIT_PULL_REQUEST_LABELS contains "build_pr_images"'
7779
- event: pull_request
7880
path: *when_path
@@ -95,7 +97,7 @@ steps:
9597
PLATFORMS: linux|amd64
9698
TAGS: sqlite sqlite_unlock_notify netgo
9799
when:
98-
- event: pull_request
100+
- event: [pull_request, pull_request_metadata]
99101
evaluate: 'CI_COMMIT_PULL_REQUEST_LABELS contains "build_pr_images"'
100102
- event: pull_request
101103
path: *when_path
@@ -131,7 +133,7 @@ steps:
131133
logins: *publish_logins
132134
when: &when-preview
133135
evaluate: 'CI_COMMIT_PULL_REQUEST_LABELS contains "build_pr_images"'
134-
event: pull_request
136+
event: [pull_request, pull_request_metadata]
135137

136138
build-server-dryrun:
137139
depends_on:
@@ -305,6 +307,19 @@ steps:
305307
# C L I #
306308
#########
307309

310+
build-cli-alpine-preview:
311+
depends_on:
312+
- vendor
313+
image: *buildx_plugin
314+
settings:
315+
repo: woodpeckerci/woodpecker-cli
316+
dockerfile: docker/Dockerfile.cli.alpine.multiarch.rootless
317+
platforms: *platforms_preview
318+
tag: pull_${CI_COMMIT_PULL_REQUEST}-alpine
319+
build_args: *build_args
320+
logins: *publish_logins
321+
when: *when-preview
322+
308323
build-cli-dryrun:
309324
depends_on:
310325
- vendor

0 commit comments

Comments
 (0)