Skip to content

Commit

Permalink
chore: Merge from PR branch
Browse files Browse the repository at this point in the history
  • Loading branch information
langecode committed Feb 20, 2024
2 parents cc841cf + a6f247e commit f864b8c
Show file tree
Hide file tree
Showing 366 changed files with 17,234 additions and 5,544 deletions.
113 changes: 113 additions & 0 deletions .cspell.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
{
"version": "0.2",
"language": "en",
"words": [
"ciphertext",
"evenodd",
"gitea",
"gonic",
"Netrc",
"prismjs",
"rawurl",
"Refspec",
"securecookie",
"sess",
"techknowlogick",
"vueuse",
"windicss",
"xorm",
"xormigrate",
"zerolog",
"Msgf",
"varchar",
"autoincr",
"stretchr",
"bradrydzewski",
"octocat",
"brightbox",
"anbraten",
"Codeberg",
"Fediverse",
"Weblate",
"Hetzner",
"windi",
"intlify",
"unplugin",
"Pinia",
"woodpeckerci",
"tinycolor",
"favicons",
"Laszlo",
"Fogas",
"Georgiana",
"Ionescu",
"typecheck",
"HTTPFS",
"Println",
"ppid",
"xlog",
"Debugf",
"Warnf",
"Infof",
"Wrapf",
"urfave",
"creativecommons",
"compatiblelicenses",
"sublicensable",
"waivable",
"kyvg",
"iconify",
"Upsert",
"Rydzewski",
"fsnotify",
"tink",
"desaturate",
"golangci",
"Kaniko",
"Reviewdog",
"DATASOURCE",
"httpsig",
"envsubst",
"TARGETOS",
"TARGETARCH",
"GOARCH",
"Curr",
"doublestar",
"multierr",
"markdownlint",
"buildx",
"HEALTHCHECK",
"devx",
"gomod",
"laszlocph"
],
"ignorePaths": [
"**/node_modules/**/*",
"pnpm-lock.yaml",
".gitignore",
".git/**/*",
".cspell.json",
".golangci.yaml",
".vscode/extensions.json",
"web/src/assets/locales/**/*",
"web/components.d.ts",
"server/store/datastore/migration/**/*",
"go.mod",
"go.sum",
"*.excalidraw",
"*.svg",
"Makefile",
// TODO: remove the following
"CHANGELOG.md",
".woodpecker/",
"agent/",
"cli/",
"cmd/",
"docker/",
"docs/",
"pipeline/",
"shared/",
"server/"
],
"enableFiletypes": ["dockercompose"]
}
2 changes: 1 addition & 1 deletion .ecrc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"fixtures",
"LICENSE",
"node_modules",
"server/store/datastore/migration/testfiles/sqlite.db",
"server/store/datastore/migration/test-files/sqlite.db",
"server/store/datastore/feed.go",
"cmd/server/docs/docs.go",
"_test.go",
Expand Down
21 changes: 11 additions & 10 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["github>woodpecker-ci/renovate-config"],
"prConcurrentLimit": 5,
"packageRules": [
{
"matchManagers": ["docker-compose"],
"matchFileNames": ["docker-compose.gitpod.yml"],
"labels": ["devx"]
},
{
"matchManagers": ["gomod", "npm", "dockerfile"],
"labels": ["dependencies"]
},
{
"matchManagers": ["woodpecker"],
"labels": ["build"]
"addLabels": ["devx"]
},
{
"groupName": "golang (lang)",
Expand All @@ -26,6 +17,16 @@
"matchManagers": ["gomod"],
"matchUpdateTypes": ["minor", "patch"]
},
{
"matchManagers": ["npm"],
"matchFileNames": ["web/package.json"],
"addLabels": ["ui"]
},
{
"matchManagers": ["npm"],
"matchFileNames": ["docs/**/package.json"],
"addLabels": ["documentation"]
},
{
"groupName": "web npm deps non-major",
"matchManagers": ["npm"],
Expand Down
7 changes: 5 additions & 2 deletions .gitpod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@ tasks:
$DOCKER_COMPOSE_CMD up -d
until curl --output /dev/null --silent --head --fail http://localhost:3000; do printf '.'; sleep 1; done
$GITEA_CLI_CMD admin user create --username woodpecker --password password --email woodpecker@localhost --admin
export GITEA_TOKEN=$($GITEA_CLI_CMD admin user generate-access-token -u woodpecker --scopes repo,write:application --raw)
export GITEA_TOKEN=$($GITEA_CLI_CMD admin user generate-access-token -u woodpecker --scopes write:repository,write:user --raw | tail -n 1 | awk 'NF{ print $NF }')
GITEA_OAUTH_APP=$(curl -X 'POST' 'http://localhost:3000/api/v1/user/applications/oauth2' \
-H 'accept: application/json' -H 'Content-Type: application/json' -H "Authorization: token ${GITEA_TOKEN}" \
-d "{ \"name\": \"Woodpecker CI\", \"confidential_client\": true, \"redirect_uris\": [ \"https://8000-${GITPOD_WORKSPACE_ID}.${GITPOD_WORKSPACE_CLUSTER_HOST}/authorize\" ] }")
touch .env
grep "WOODPECKER_GITEA_CLIENT=" .env \
&& sed "s,^WOODPECKER_GITEA_CLIENT=.*,WOODPECKER_GITEA_CLIENT=$(echo $GITEA_OAUTH_APP | jq -r .client_id)," .env \
|| echo WOODPECKER_GITEA_CLIENT=$(echo $GITEA_OAUTH_APP | jq -r .client_id) >> .env
Expand All @@ -63,7 +64,7 @@ tasks:
git checkout -b main
git remote add origin http://woodpecker:${GITEA_TOKEN}@localhost:3000/woodpecker/woodpecker-test.git
git add .
git commit -m ":tada: Initial commit"
git commit -m "Initial commit"
git push -u origin main
cd ../..
gp sync-done gitea
Expand Down Expand Up @@ -105,6 +106,7 @@ ports:

vscode:
extensions:
# cSpell:disable
- 'golang.go'
- 'EditorConfig.EditorConfig'
- 'dbaeumer.vscode-eslint'
Expand All @@ -114,3 +116,4 @@ vscode:
- 'redhat.vscode-yaml'
- 'davidanson.vscode-markdownlint'
- 'streetsidesoftware.code-spell-checker'
# cSpell:enable
2 changes: 1 addition & 1 deletion .markdownlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,5 @@ MD046:

# MD048/code-fence-style - Code fence style
MD048:
# Code fence syle
# Code fence style
style: 'backtick'
5 changes: 3 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# cSpell:ignore checkmake hadolint autofix autoupdate
repos:
- repo: meta
hooks:
Expand All @@ -13,10 +14,10 @@ repos:
hooks:
- id: golangci-lint
- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.38.0
rev: v0.39.0
hooks:
- id: markdownlint
exclude: '^docs/versioned_docs/.*$'
exclude: '^(docs/versioned_docs/.*|CHANGELOG.md)$'
- repo: https://github.com/mrtazz/checkmake
rev: 0.2.2
hooks:
Expand Down
4 changes: 1 addition & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@
"go.lintTool": "golangci-lint",
"go.lintFlags": ["--fast"],
"eslint.workingDirectories": ["./web"],
"prettier.configPath": "./web/.prettierrc.js",
"prettier.ignorePath": "./web/.prettierignore",
"cSpell.words": ["Curr", "doublestar", "ERRORLEVEL", "multierr"]
"prettier.ignorePath": "./web/.prettierignore"
}
4 changes: 2 additions & 2 deletions .woodpecker/binaries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ when:
event: tag

variables:
- &golang_image 'docker.io/golang:1.21.6'
- &golang_image 'docker.io/golang:1.22.0'
- &node_image 'docker.io/node:21-alpine'
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.21.5'
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.0'
- &xgo_version 'go-1.21.2'

steps:
Expand Down
6 changes: 3 additions & 3 deletions .woodpecker/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ when:
- renovate/*

variables:
- &golang_image 'docker.io/golang:1.21.6'
- &golang_image 'docker.io/golang:1.22.0'
- &node_image 'docker.io/node:21-alpine'
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.21.5'
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.0'
- &xgo_version 'go-1.21.2'
- &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:3.0.0'
- &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:3.1.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'
- &platforms_preview 'linux/amd64'
Expand Down
34 changes: 34 additions & 0 deletions .woodpecker/static.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
when:
- event: pull_request
- event: push
branch: renovate/*

steps:
- name: lint-editorconfig
image: docker.io/mstruebing/editorconfig-checker:2.7.2
depends_on: []
when:
- event: pull_request
- event: push
branch: renovate/*

- name: spellcheck
image: docker.io/node:21-alpine
depends_on: []
commands:
- corepack enable
- pnpx cspell lint --no-progress --gitignore '{**,.*}/{*,.*}'

- name: prettier
image: docker.io/woodpeckerci/plugin-prettier:0.1.0
depends_on: []
settings:
version: 3.2.4

- name: links
image: lycheeverse/lychee:0.14.0
depends_on: []
commands:
- lychee pipeline/frontend/yaml/linter/schema/schema.json
- lychee --exclude localhost docs/docs/
- lychee --exclude localhost docs/src/pages/
16 changes: 0 additions & 16 deletions .woodpecker/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,29 +68,13 @@ steps:
- '[ -n "$DIFF" ] && { echo "swagger not up to date, exec `make generate-swagger` and commit"; exit 1; } || true'
when: *when

lint-editorconfig:
image: docker.io/mstruebing/editorconfig-checker:2.7.2
when:
- event: pull_request
- event: push
branch: renovate/*

lint-license-header:
image: *golang_image
commands:
- go install github.com/google/addlicense@latest
- 'addlicense -check -ignore "vendor/**" **/*.go'
when: *when

prettier:
image: docker.io/woodpeckerci/plugin-prettier:0.1.0
settings:
version: 3.2.4
when:
- event: pull_request
- event: push
branch: renovate/*

test:
depends_on:
- vendor
Expand Down
2 changes: 1 addition & 1 deletion .yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ignore-from-file:
- docs/.gitignore
- docs/plugins/woodpecker-plugins/.gitignore
- .gitignore
- server/store/datastore/migration/testfiles/.gitignore
- server/store/datastore/migration/test-files/.gitignore
- web/.gitignore

rules:
Expand Down
47 changes: 47 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,52 @@
# Changelog

## [2.3.0](https://github.com/woodpecker-ci/woodpecker/releases/tag/2.3.0) - 2024-01-31

### ❤️ Thanks to all contributors! ❤️

@anbraten, @HerHde, @qwerty287, @pat-s, @renovate[bot], @lukashass, @zc-devs, @Alonsohhl, @healdropper, @eliasscosta, @runephilosof-karnovgroup

### ✨ Features

- Add release event [[#3226](https://github.com/woodpecker-ci/woodpecker/pull/3226)]

### 📚 Documentation

- Add release types [[#3303](https://github.com/woodpecker-ci/woodpecker/pull/3303)]
- Add opencollective footer [[#3281](https://github.com/woodpecker-ci/woodpecker/pull/3281)]
- Use array syntax in docs [[#3242](https://github.com/woodpecker-ci/woodpecker/pull/3242)]

### 🐛 Bug Fixes

- Fix Gitpod: Gitea auth token creation [[#3299](https://github.com/woodpecker-ci/woodpecker/pull/3299)]
- Fix agent updating [[#3287](https://github.com/woodpecker-ci/woodpecker/pull/3287)]
- Sanitize pod's step label [[#3275](https://github.com/woodpecker-ci/woodpecker/pull/3275)]
- Pipeline errors must be an array [[#3276](https://github.com/woodpecker-ci/woodpecker/pull/3276)]
- fix bitbucket SSO using UUID from bitbucket api response as ForgeRemoteID [[#3265](https://github.com/woodpecker-ci/woodpecker/pull/3265)]
- fix: bug pod service without label service [[#3256](https://github.com/woodpecker-ci/woodpecker/pull/3256)]
- Fix disabling PRs [[#3258](https://github.com/woodpecker-ci/woodpecker/pull/3258)]
- fix: bug annotations [[#3255](https://github.com/woodpecker-ci/woodpecker/pull/3255)]

### 📈 Enhancement

- Update theme on system color mode change [[#3296](https://github.com/woodpecker-ci/woodpecker/pull/3296)]
- Improve secrets availability checks [[#3271](https://github.com/woodpecker-ci/woodpecker/pull/3271)]
- Load more pipeline log lines (500 => 5000) [[#3212](https://github.com/woodpecker-ci/woodpecker/pull/3212)]
- Clean up models [[#3228](https://github.com/woodpecker-ci/woodpecker/pull/3228)]

### Misc

- chore(deps): update docker.io/techknowlogick/xgo docker tag to go-1.21.6 [[#3294](https://github.com/woodpecker-ci/woodpecker/pull/3294)]
- fix(deps): update docs npm deps non-major [[#3295](https://github.com/woodpecker-ci/woodpecker/pull/3295)]
- Remove deprecated `group` from config [[#3289](https://github.com/woodpecker-ci/woodpecker/pull/3289)]
- Add spellcheck config [[#3018](https://github.com/woodpecker-ci/woodpecker/pull/3018)]
- fix(deps): update golang (packages) [[#3284](https://github.com/woodpecker-ci/woodpecker/pull/3284)]
- chore(deps): lock file maintenance [[#3274](https://github.com/woodpecker-ci/woodpecker/pull/3274)]
- chore(deps): update web npm deps non-major [[#3273](https://github.com/woodpecker-ci/woodpecker/pull/3273)]
- Pin prettier version [[#3260](https://github.com/woodpecker-ci/woodpecker/pull/3260)]
- Fix prettier [[#3259](https://github.com/woodpecker-ci/woodpecker/pull/3259)]
- Update UI building in Makefile [[#3250](https://github.com/woodpecker-ci/woodpecker/pull/3250)]

## [2.2.2](https://github.com/woodpecker-ci/woodpecker/releases/tag/2.2.2) - 2024-01-21

### ❤️ Thanks to all contributors! ❤️
Expand Down
Loading

0 comments on commit f864b8c

Please sign in to comment.