mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2025-01-04 06:38:43 +00:00
Merge branch 'main' into feat/outline-icons
This commit is contained in:
pat-s
commit
de8c23ee46
13 changed files with 1723 additions and 2333 deletions
|
|
@ -13,6 +13,7 @@
|
|||
"anbraten",
|
||||
"antfu",
|
||||
"apimachinery",
|
||||
"appleboy",
|
||||
"Archlinux",
|
||||
"autoincr",
|
||||
"automerge",
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -799,8 +799,8 @@ Privileged mode is only available to trusted repositories and for security reaso
|
|||
commands:
|
||||
- docker --tls=false ps
|
||||
|
||||
- name: services
|
||||
docker:
|
||||
services:
|
||||
- name: docker
|
||||
image: docker:dind
|
||||
commands: dockerd-entrypoint.sh --storage-driver=vfs --tls=false
|
||||
+ privileged: true
|
||||
|
|
|
|||
|
|
@ -41,11 +41,19 @@ Only server admins can set this option. If you are not a server admin this optio
|
|||
|
||||
## Custom trusted clone plugins
|
||||
|
||||
The clone step may require Git credentials (e.g. for private repos) which are injected via `netrc`.
|
||||
During the clone process, Git credentials (e.g., for private repositories) may be required.
|
||||
These credentials are provided via [`netrc`](https://everything.curl.dev/usingcurl/netrc.html).
|
||||
|
||||
They are only injected into trusted plugins listed in the env var `WOODPECKER_PLUGINS_TRUSTED_CLONE` or in this repo setting.
|
||||
These credentials are injected only into trusted plugins specified in the environment variable `WOODPECKER_PLUGINS_TRUSTED_CLONE` (an instance-wide Woodpecker server setting) or declared in this repository-level setting.
|
||||
|
||||
This allows you to use a trusted plugin for in the clone section or as a step to pull or push using your git credentials.
|
||||
With these credentials, it’s possible to perform any Git operations, including pushing changes back to the repo.
|
||||
To prevent unauthorized access or misuse, a plugin allowlist is required, either on the instance level or the repository level.
|
||||
Without an explicit allowlist, a malicious contributor could exploit a custom clone plugin in a Pull Request to reveal or transfer these credentials during the clone step.
|
||||
|
||||
:::info
|
||||
This setting does not affect subsequent steps, nor does it allow direct pushes to the repository.
|
||||
To enable pushing changes, you can inject Git credentials as a secret or use a dedicated plugin, such as [appleboy/drone-git-push](https://woodpecker-ci.org/plugins/Git%20Push).
|
||||
:::
|
||||
|
||||
## Project visibility
|
||||
|
||||
|
|
|
|||
2152
docs/pnpm-lock.yaml
2152
docs/pnpm-lock.yaml
File diff suppressed because it is too large
Load diff
|
|
@ -777,8 +777,8 @@ Privileged mode is only available to trusted repositories and for security reaso
|
|||
commands:
|
||||
- docker --tls=false ps
|
||||
|
||||
- name: services
|
||||
docker:
|
||||
services:
|
||||
- name: docker
|
||||
image: docker:dind
|
||||
commands: dockerd-entrypoint.sh --storage-driver=vfs --tls=false
|
||||
+ privileged: true
|
||||
|
|
|
|||
8
go.mod
8
go.mod
|
|
@ -55,7 +55,7 @@ require (
|
|||
github.com/urfave/cli-docs/v3 v3.0.0-alpha6
|
||||
github.com/urfave/cli/v3 v3.0.0-beta1
|
||||
github.com/xeipuuv/gojsonschema v1.2.0
|
||||
github.com/yaronf/httpsign v0.3.1
|
||||
github.com/yaronf/httpsign v0.3.2
|
||||
github.com/zalando/go-keyring v0.2.6
|
||||
gitlab.com/gitlab-org/api/client-go v0.118.0
|
||||
go.uber.org/multierr v1.11.0
|
||||
|
|
@ -66,7 +66,7 @@ require (
|
|||
golang.org/x/term v0.27.0
|
||||
golang.org/x/text v0.21.0
|
||||
google.golang.org/grpc v1.69.2
|
||||
google.golang.org/protobuf v1.36.0
|
||||
google.golang.org/protobuf v1.36.1
|
||||
gopkg.in/yaml.v3 v3.0.1
|
||||
k8s.io/api v0.32.0
|
||||
k8s.io/apimachinery v0.32.0
|
||||
|
|
@ -145,9 +145,9 @@ require (
|
|||
github.com/leodido/go-urn v1.4.0 // indirect
|
||||
github.com/lestrrat-go/blackmagic v1.0.2 // indirect
|
||||
github.com/lestrrat-go/httpcc v1.0.1 // indirect
|
||||
github.com/lestrrat-go/httprc v1.0.5 // indirect
|
||||
github.com/lestrrat-go/httprc v1.0.6 // indirect
|
||||
github.com/lestrrat-go/iter v1.0.2 // indirect
|
||||
github.com/lestrrat-go/jwx/v2 v2.1.0 // indirect
|
||||
github.com/lestrrat-go/jwx/v2 v2.1.2 // indirect
|
||||
github.com/lestrrat-go/option v1.0.1 // indirect
|
||||
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
|
||||
github.com/mailru/easyjson v0.7.7 // indirect
|
||||
|
|
|
|||
16
go.sum
16
go.sum
|
|
@ -353,12 +353,12 @@ github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N
|
|||
github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU=
|
||||
github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE=
|
||||
github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E=
|
||||
github.com/lestrrat-go/httprc v1.0.5 h1:bsTfiH8xaKOJPrg1R+E3iE/AWZr/x0Phj9PBTG/OLUk=
|
||||
github.com/lestrrat-go/httprc v1.0.5/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
|
||||
github.com/lestrrat-go/httprc v1.0.6 h1:qgmgIRhpvBqexMJjA/PmwSvhNk679oqD1RbovdCGW8k=
|
||||
github.com/lestrrat-go/httprc v1.0.6/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo=
|
||||
github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI=
|
||||
github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4=
|
||||
github.com/lestrrat-go/jwx/v2 v2.1.0 h1:0zs7Ya6+39qoit7gwAf+cYm1zzgS3fceIdo7RmQ5lkw=
|
||||
github.com/lestrrat-go/jwx/v2 v2.1.0/go.mod h1:Xpw9QIaUGiIUD1Wx0NcY1sIHwFf8lDuZn/cmxtXYRys=
|
||||
github.com/lestrrat-go/jwx/v2 v2.1.2 h1:6poete4MPsO8+LAEVhpdrNI4Xp2xdiafgl2RD89moBc=
|
||||
github.com/lestrrat-go/jwx/v2 v2.1.2/go.mod h1:pO+Gz9whn7MPdbsqSJzG8TlEpMZCwQDXnFJ+zsUVh8Y=
|
||||
github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU=
|
||||
github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I=
|
||||
github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
|
||||
|
|
@ -548,8 +548,8 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
|
|||
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
|
||||
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
|
||||
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
|
||||
github.com/yaronf/httpsign v0.3.1 h1:A4pqjwOVCwlExyy/mPTTryCHcXn+xhq4+wxq4BKhi2k=
|
||||
github.com/yaronf/httpsign v0.3.1/go.mod h1:+7d6GccMcoljvE3QtU00NCmR1iTXCVNfbMe5nqaxRG4=
|
||||
github.com/yaronf/httpsign v0.3.2 h1:rBYYx9eHm60noI4oC24JAD2tJuM8AUDh9ErJO/FfzBs=
|
||||
github.com/yaronf/httpsign v0.3.2/go.mod h1:cYB/6toJrJnf4JTLVoo6IHzFH9/Zu1dcKmah4xfX2WA=
|
||||
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||
|
|
@ -732,8 +732,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
|
|||
google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
|
||||
google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
|
||||
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
|
||||
google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
|
||||
google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
|
||||
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
|
||||
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
|
||||
|
|
|
|||
|
|
@ -18,52 +18,52 @@
|
|||
"test": "vitest"
|
||||
},
|
||||
"dependencies": {
|
||||
"@intlify/unplugin-vue-i18n": "^6.0.0",
|
||||
"@kyvg/vue3-notification": "^3.2.1",
|
||||
"@kyvg/vue3-notification": "^3.4.1",
|
||||
"@mdi/js": "^7.4.47",
|
||||
"@vueuse/core": "^12.0.0",
|
||||
"@vueuse/core": "^12.2.0",
|
||||
"ansi_up": "^6.0.2",
|
||||
"dompurify": "^3.2.0",
|
||||
"dompurify": "^3.2.3",
|
||||
"fuse.js": "^7.0.0",
|
||||
"js-base64": "^3.7.7",
|
||||
"lodash": "^4.17.21",
|
||||
"marked": "^15.0.0",
|
||||
"node-emoji": "^2.1.3",
|
||||
"pinia": "^2.2.1",
|
||||
"marked": "^15.0.4",
|
||||
"node-emoji": "^2.2.0",
|
||||
"pinia": "^2.3.0",
|
||||
"prismjs": "^1.29.0",
|
||||
"semver": "^7.6.3",
|
||||
"simple-icons": "^13.5.0",
|
||||
"vue": "^3.4.38",
|
||||
"vue-i18n": "^10.0.3",
|
||||
"vue-router": "^4.4.3"
|
||||
"simple-icons": "^13.21.0",
|
||||
"vue": "^3.5.13",
|
||||
"vue-i18n": "^10.0.5",
|
||||
"vue-router": "^4.5.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antfu/eslint-config": "^3.3.2",
|
||||
"@eslint/js": "^9.9.0",
|
||||
"@ianvs/prettier-plugin-sort-imports": "^4.3.1",
|
||||
"@intlify/eslint-plugin-vue-i18n": "3.1.0",
|
||||
"@antfu/eslint-config": "^3.12.1",
|
||||
"@eslint/js": "^9.17.0",
|
||||
"@ianvs/prettier-plugin-sort-imports": "^4.4.0",
|
||||
"@intlify/eslint-plugin-vue-i18n": "3.2.0",
|
||||
"@intlify/unplugin-vue-i18n": "^6.0.2",
|
||||
"@types/eslint__js": "^8.42.3",
|
||||
"@types/lodash": "^4.17.7",
|
||||
"@types/node": "^22.0.0",
|
||||
"@types/prismjs": "^1.26.4",
|
||||
"@types/lodash": "^4.17.13",
|
||||
"@types/node": "^22.10.2",
|
||||
"@types/prismjs": "^1.26.5",
|
||||
"@types/semver": "^7.5.8",
|
||||
"@types/tinycolor2": "^1.4.6",
|
||||
"@vitejs/plugin-vue": "^5.1.2",
|
||||
"@vue/compiler-sfc": "^3.4.38",
|
||||
"@vitejs/plugin-vue": "^5.2.1",
|
||||
"@vue/compiler-sfc": "^3.5.13",
|
||||
"@vue/test-utils": "^2.4.6",
|
||||
"eslint": "^9.9.0",
|
||||
"eslint-plugin-promise": "^7.1.0",
|
||||
"eslint-plugin-vue-scoped-css": "^2.8.1",
|
||||
"jsdom": "^25.0.0",
|
||||
"prettier": "^3.3.3",
|
||||
"eslint": "^9.17.0",
|
||||
"eslint-plugin-promise": "^7.2.1",
|
||||
"eslint-plugin-vue-scoped-css": "^2.9.0",
|
||||
"jsdom": "^25.0.1",
|
||||
"prettier": "^3.4.2",
|
||||
"tinycolor2": "^1.6.0",
|
||||
"typescript": "5.6.3",
|
||||
"vite": "^6.0.0",
|
||||
"typescript": "5.7.2",
|
||||
"vite": "^6.0.5",
|
||||
"vite-plugin-prismjs": "^0.0.11",
|
||||
"vite-plugin-windicss": "^1.9.3",
|
||||
"vite-plugin-windicss": "^1.9.4",
|
||||
"vite-svg-loader": "^5.1.0",
|
||||
"vitest": "^2.0.5",
|
||||
"vue-tsc": "^2.0.29",
|
||||
"vitest": "^2.1.8",
|
||||
"vue-tsc": "^2.2.0",
|
||||
"windicss": "^3.5.6"
|
||||
},
|
||||
"pnpm": {
|
||||
|
|
|
|||
1751
web/pnpm-lock.yaml
1751
web/pnpm-lock.yaml
File diff suppressed because it is too large
Load diff
|
|
@ -92,7 +92,9 @@
|
|||
class="transition-height duration-150 overflow-hidden"
|
||||
:class="{
|
||||
'max-h-0': workflowsCollapsed[workflow.id],
|
||||
'ml-6': !singleConfig,
|
||||
}"
|
||||
:style="{
|
||||
marginLeft: !singleConfig ? '1.6rem' : '',
|
||||
}"
|
||||
>
|
||||
<button
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ import type { Plugin } from 'vite';
|
|||
import prismjs from 'vite-plugin-prismjs';
|
||||
import WindiCSS from 'vite-plugin-windicss';
|
||||
import svgLoader from 'vite-svg-loader';
|
||||
import type { ViteUserConfig } from 'vitest/config';
|
||||
import { defineConfig } from 'vitest/config';
|
||||
|
||||
function woodpeckerInfoPlugin(): Plugin {
|
||||
|
|
@ -91,4 +92,4 @@ export default defineConfig({
|
|||
globals: true,
|
||||
environment: 'jsdom',
|
||||
},
|
||||
});
|
||||
} as ViteUserConfig);
|
||||
|
|
|
|||
Loading…
Reference in a new issue