diff --git a/.cspell.json b/.cspell.json index 8774c09be..419c4e0db 100644 --- a/.cspell.json +++ b/.cspell.json @@ -13,6 +13,7 @@ "anbraten", "antfu", "apimachinery", + "appleboy", "Archlinux", "autoincr", "automerge", @@ -38,6 +39,7 @@ "cpuset", "creativecommons", "Curr", + "CERTDIR", "datacenter", "DATASOURCE", "Debugf", diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 074502363..8fef8d0a7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,8 +27,8 @@ repos: rev: v2.13.1-beta hooks: - id: hadolint - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v4.0.0-alpha.8 + - repo: https://github.com/rbubley/mirrors-prettier + rev: v3.4.2 hooks: - id: prettier - repo: https://github.com/adrienverge/yamllint.git diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml index 16fbee026..d5b164496 100644 --- a/.woodpecker/docker.yaml +++ b/.woodpecker/docker.yaml @@ -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: @@ -197,8 +185,7 @@ steps: repo: *publish_repos_server dockerfile: docker/Dockerfile.server.multiarch platforms: *platforms_server - # remove 'latest' on older version branches to avoid accidental downgrade - tag: [latest, '${CI_COMMIT_TAG}'] + tag: ['${CI_COMMIT_TAG%%.*}', '${CI_COMMIT_TAG%.*}-alpine', '${CI_COMMIT_TAG}'] logins: *publish_logins when: &when-release event: tag @@ -211,8 +198,7 @@ steps: repo: *publish_repos_server dockerfile: docker/Dockerfile.server.alpine.multiarch platforms: *platforms_alpine - # remove 'latest-alpine' on older version branches to avoid accidental downgrade - tag: [latest-alpine, '${CI_COMMIT_TAG}-alpine'] + tag: ['${CI_COMMIT_TAG%%.*}-alpine', '${CI_COMMIT_TAG%.*}-alpine', '${CI_COMMIT_TAG}-alpine'] logins: *publish_logins when: *when-release @@ -220,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 @@ -292,8 +278,7 @@ steps: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.multiarch platforms: *platforms_release - # remove 'latest' on older version branches to avoid accidental downgrade - tag: [latest, '${CI_COMMIT_TAG}'] + tag: ['${CI_COMMIT_TAG%%.*}', '${CI_COMMIT_TAG%.*}', '${CI_COMMIT_TAG}'] logins: *publish_logins build_args: *build_args when: *when-release @@ -309,8 +294,7 @@ steps: repo: *publish_repos_agent dockerfile: docker/Dockerfile.agent.alpine.multiarch platforms: *platforms_alpine - # remove 'latest-alpine' on older version branches to avoid accidental downgrade - tag: [latest-alpine, '${CI_COMMIT_TAG}-alpine'] + tag: ['${CI_COMMIT_TAG%%.*}-alpine', '${CI_COMMIT_TAG%.*}-alpine', '${CI_COMMIT_TAG}-alpine'] logins: *publish_logins build_args: *build_args when: *when-release @@ -319,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 @@ -388,8 +359,7 @@ steps: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.multiarch platforms: *platforms_release - # remove 'latest' on older version branches to avoid accidental downgrade - tag: [latest, '${CI_COMMIT_TAG}'] + tag: ['${CI_COMMIT_TAG%%.*}', '${CI_COMMIT_TAG%.*}', '${CI_COMMIT_TAG}'] logins: *publish_logins build_args: *build_args when: *when-release @@ -405,8 +375,7 @@ steps: repo: *publish_repos_cli dockerfile: docker/Dockerfile.cli.alpine.multiarch platforms: *platforms_alpine - # remove 'latest-alpine' on older version branches to avoid accidental downgrade - tag: [latest-alpine, '${CI_COMMIT_TAG}-alpine'] + tag: ['${CI_COMMIT_TAG%%.*}-alpine', '${CI_COMMIT_TAG%.*}-alpine', '${CI_COMMIT_TAG}-alpine'] logins: *publish_logins build_args: *build_args when: *when-release diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml index be19e972f..724f7a71b 100644 --- a/.woodpecker/test.yaml +++ b/.woodpecker/test.yaml @@ -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 @@ -125,7 +125,7 @@ steps: - test - sqlite pull: true - image: docker.io/woodpeckerci/plugin-codecov:2.1.5 + image: docker.io/woodpeckerci/plugin-codecov:2.1.6 settings: files: - agent-coverage.out diff --git a/CHANGELOG.md b/CHANGELOG.md index 1acf8854a..63dd72544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,320 @@ # Changelog +## [3.0.0](https://github.com/woodpecker-ci/woodpecker/releases/tag/v3.0.0) - 2024-12-13 + +### ❤️ Thanks to all contributors! ❤️ + +@6543, @Fishbowler, @M0Rf30, @anbraten, @cduchenoy, @fernandrone, @gnowland, @greenaar, @hg, @j04n-f, @jenrik, @johanneskastl, @jolheiser, @lafriks, @lukashass, @meln5674, @not-my-profile, @pat-s, @qwerty287, @smainz, @tori-27, @tsufeki, @xoxys, @xtexChooser, @zc-devs + +### 💥 Breaking changes + +- Drop native Let's Encrypt support [[#4541](https://github.com/woodpecker-ci/woodpecker/pull/4541)] +- Set new default approval mode based on repo visibility [[#4456](https://github.com/woodpecker-ci/woodpecker/pull/4456)] +- Do not set empty environment variables [[#4193](https://github.com/woodpecker-ci/woodpecker/pull/4193)] +- Unify cli commands and flags [[#4481](https://github.com/woodpecker-ci/woodpecker/pull/4481)] +- Move pipeline logs command [[#4480](https://github.com/woodpecker-ci/woodpecker/pull/4480)] +- Fix woodpecker-go repo model to match server [[#4479](https://github.com/woodpecker-ci/woodpecker/pull/4479)] +- Restructure cli commands [[#4467](https://github.com/woodpecker-ci/woodpecker/pull/4467)] +- Add pagination options to all supported endpoints in sdk [[#4463](https://github.com/woodpecker-ci/woodpecker/pull/4463)] +- Allow to set custom trusted clone plugins [[#4352](https://github.com/woodpecker-ci/woodpecker/pull/4352)] +- Add PipelineListsOptions to woodpecker-go [[#3652](https://github.com/woodpecker-ci/woodpecker/pull/3652)] +- Remove `secrets` in favor of `from_secret` [[#4363](https://github.com/woodpecker-ci/woodpecker/pull/4363)] +- Kubernetes | Docker: Add support for rootless images [[#4151](https://github.com/woodpecker-ci/woodpecker/pull/4151)] +- Split repo trusted setting [[#4025](https://github.com/woodpecker-ci/woodpecker/pull/4025)] +- Move docker resource limit settings from server to agent [[#3174](https://github.com/woodpecker-ci/woodpecker/pull/3174)] +- Set `/woodpecker` as default workdir for the **woodpecker-cli** container [[#4130](https://github.com/woodpecker-ci/woodpecker/pull/4130)] +- Require upgrade from 2.x [[#4112](https://github.com/woodpecker-ci/woodpecker/pull/4112)] +- Don't expose task data via api [[#4108](https://github.com/woodpecker-ci/woodpecker/pull/4108)] +- Remove some ci environment variables [[#3846](https://github.com/woodpecker-ci/woodpecker/pull/3846)] +- Remove all default privileged plugins [[#4053](https://github.com/woodpecker-ci/woodpecker/pull/4053)] +- Add option to filter secrets by plugins with specific tags [[#4069](https://github.com/woodpecker-ci/woodpecker/pull/4069)] +- Remove old pipeline options [[#4016](https://github.com/woodpecker-ci/woodpecker/pull/4016)] +- Remove various deprecations [[#4017](https://github.com/woodpecker-ci/woodpecker/pull/4017)] +- Drop repo name fallback for hooks [[#4013](https://github.com/woodpecker-ci/woodpecker/pull/4013)] +- Improve local backend detection [[#4006](https://github.com/woodpecker-ci/woodpecker/pull/4006)] +- Refactor JSON and SDK fields [[#3968](https://github.com/woodpecker-ci/woodpecker/pull/3968)] +- Migrate to maintained cron lib and remove seconds [[#3785](https://github.com/woodpecker-ci/woodpecker/pull/3785)] +- Switch to profile-based AppArmor configuration [[#4008](https://github.com/woodpecker-ci/woodpecker/pull/4008)] +- Remove Kubernetes default image pull secret name `regcred` [[#4005](https://github.com/woodpecker-ci/woodpecker/pull/4005)] +- Drop "WOODPECKER_WEBHOOK_HOST" env var and adjust docs [[#3969](https://github.com/woodpecker-ci/woodpecker/pull/3969)] +- Drop version in schema [[#3970](https://github.com/woodpecker-ci/woodpecker/pull/3970)] +- Update docker to v27 [[#3972](https://github.com/woodpecker-ci/woodpecker/pull/3972)] +- Require gitlab 12.4 [[#3966](https://github.com/woodpecker-ci/woodpecker/pull/3966)] +- Migrate to maintained httpsign library [[#3839](https://github.com/woodpecker-ci/woodpecker/pull/3839)] +- Remove `WOODPECKER_DEV_OAUTH_HOST` and `WOODPECKER_DEV_GITEA_OAUTH_URL` [[#3961](https://github.com/woodpecker-ci/woodpecker/pull/3961)] +- Remove deprecated pipeline keywords: `pipeline:`, `platform:`, `branches:` [[#3916](https://github.com/woodpecker-ci/woodpecker/pull/3916)] +- server: remove old unused routes [[#3845](https://github.com/woodpecker-ci/woodpecker/pull/3845)] +- CLI: remove step-id and add step-number as option to logs [[#3927](https://github.com/woodpecker-ci/woodpecker/pull/3927)] + +### 🔒 Security + +- Add server config to disable user registered agents [[#4206](https://github.com/woodpecker-ci/woodpecker/pull/4206)] +- chore: fix `http-proxy-middleware` CVE [[#4257](https://github.com/woodpecker-ci/woodpecker/pull/4257)] +- Allow altering trusted clone plugins and filter them via tag [[#4074](https://github.com/woodpecker-ci/woodpecker/pull/4074)] +- Update gitea sdk [[#4012](https://github.com/woodpecker-ci/woodpecker/pull/4012)] +- Update Forgejo SDK [[#3948](https://github.com/woodpecker-ci/woodpecker/pull/3948)] + +### ✨ Features + +- Add user as docker backend_option [[#4526](https://github.com/woodpecker-ci/woodpecker/pull/4526)] +- Implement org/user agents [[#3539](https://github.com/woodpecker-ci/woodpecker/pull/3539)] +- Replay pipeline using `cli exec` by downloading metadata [[#4103](https://github.com/woodpecker-ci/woodpecker/pull/4103)] +- Update clone plugin to support sha256 [[#4136](https://github.com/woodpecker-ci/woodpecker/pull/4136)] + +### 🐛 Bug Fixes + +- Fix BB ambiguous commit status key [[#4544](https://github.com/woodpecker-ci/woodpecker/pull/4544)] +- fix: addon JSON pointers [[#4508](https://github.com/woodpecker-ci/woodpecker/pull/4508)] +- Fix apparmorProfile being ignored when it's the only field [[#4507](https://github.com/woodpecker-ci/woodpecker/pull/4507)] +- Sanitize strings in table output [[#4466](https://github.com/woodpecker-ci/woodpecker/pull/4466)] +- Cleanup openapi generation [[#4331](https://github.com/woodpecker-ci/woodpecker/pull/4331)] +- Support github refresh tokens [[#3811](https://github.com/woodpecker-ci/woodpecker/pull/3811)] +- Fix not working overflow on repo list message [[#4420](https://github.com/woodpecker-ci/woodpecker/pull/4420)] +- Fix avatar column type [[#4340](https://github.com/woodpecker-ci/woodpecker/pull/4340)] +- fix `error="io: read/write on closed pipe"` on k8s backend [[#4281](https://github.com/woodpecker-ci/woodpecker/pull/4281)] +- Move update notifier dot into settings button [[#4334](https://github.com/woodpecker-ci/woodpecker/pull/4334)] +- gitea: add check if pull_request webhook is missing pull info [[#4305](https://github.com/woodpecker-ci/woodpecker/pull/4305)] +- Refresh token before loading branches [[#4284](https://github.com/woodpecker-ci/woodpecker/pull/4284)] +- Delete GitLab webhooks with partial URL match [[#4259](https://github.com/woodpecker-ci/woodpecker/pull/4259)] +- Increase `WOODPECKER_FORGE_TIMEOUT` to fix config fetching for GitLab [[#4262](https://github.com/woodpecker-ci/woodpecker/pull/4262)] +- Ensure cli exec has by default not the same prefix [[#4132](https://github.com/woodpecker-ci/woodpecker/pull/4132)] +- Fix repo add loading spinner [[#4135](https://github.com/woodpecker-ci/woodpecker/pull/4135)] +- Fix migration registries table [[#4111](https://github.com/woodpecker-ci/woodpecker/pull/4111)] +- Wait for tracer to be done before finishing workflow [[#4068](https://github.com/woodpecker-ci/woodpecker/pull/4068)] +- Fix schema with detached steps [[#4066](https://github.com/woodpecker-ci/woodpecker/pull/4066)] +- Fix schema with commands and entrypoint [[#4065](https://github.com/woodpecker-ci/woodpecker/pull/4065)] +- Read long log lines from file storage correctly [[#4048](https://github.com/woodpecker-ci/woodpecker/pull/4048)] +- Set refspec for gitlab MR [[#4021](https://github.com/woodpecker-ci/woodpecker/pull/4021)] +- Set `CI_PREV_COMMIT_{SOURCE,TARGET}_BRANCH` as mentioned in the documentation [[#4001](https://github.com/woodpecker-ci/woodpecker/pull/4001)] +- [Bitbucket Datacenter] Return empty list instead of null [[#4010](https://github.com/woodpecker-ci/woodpecker/pull/4010)] +- Fix BB PR pipeline ref [[#3985](https://github.com/woodpecker-ci/woodpecker/pull/3985)] +- Change Bitbucket PR hook to point the source branch, commit & ref [[#3965](https://github.com/woodpecker-ci/woodpecker/pull/3965)] +- Add updated, merged and declined events to bb webhook activation [[#3963](https://github.com/woodpecker-ci/woodpecker/pull/3963)] +- Fix login via navbar [[#3962](https://github.com/woodpecker-ci/woodpecker/pull/3962)] +- Truncate creation in list [[#3952](https://github.com/woodpecker-ci/woodpecker/pull/3952)] +- Fix panic if forge is unreachable [[#3944](https://github.com/woodpecker-ci/woodpecker/pull/3944)] + +### 📚 Documentation + +- Show client flags [[#4542](https://github.com/woodpecker-ci/woodpecker/pull/4542)] +- chore(deps): update react monorepo to v19 (major) [[#4523](https://github.com/woodpecker-ci/woodpecker/pull/4523)] +- chore(deps): update docs npm deps non-major [[#4519](https://github.com/woodpecker-ci/woodpecker/pull/4519)] +- chore(deps): lock file maintenance [[#4502](https://github.com/woodpecker-ci/woodpecker/pull/4502)] +- chore(deps): lock file maintenance [[#4501](https://github.com/woodpecker-ci/woodpecker/pull/4501)] +- chore(deps): update dependency isomorphic-dompurify to v2.18.0 [[#4493](https://github.com/woodpecker-ci/woodpecker/pull/4493)] +- fix(deps): update docs npm deps non-major [[#4484](https://github.com/woodpecker-ci/woodpecker/pull/4484)] +- Add migration notes for restructured cli commands [[#4476](https://github.com/woodpecker-ci/woodpecker/pull/4476)] +- Various fixes for `awesome.md` [[#4448](https://github.com/woodpecker-ci/woodpecker/pull/4448)] +- chore(deps): lock file maintenance [[#4453](https://github.com/woodpecker-ci/woodpecker/pull/4453)] +- chore(deps): update dependency isomorphic-dompurify to v2.17.0 [[#4449](https://github.com/woodpecker-ci/woodpecker/pull/4449)] +- fix(deps): update docs npm deps non-major [[#4441](https://github.com/woodpecker-ci/woodpecker/pull/4441)] +- chore(deps): update dependency @docusaurus/tsconfig to v3.6.2 [[#4433](https://github.com/woodpecker-ci/woodpecker/pull/4433)] +- chore(deps): lock file maintenance [[#4435](https://github.com/woodpecker-ci/woodpecker/pull/4435)] +- Bump minimum nodejs to v20 [[#4417](https://github.com/woodpecker-ci/woodpecker/pull/4417)] +- chore(deps): lock file maintenance [[#4402](https://github.com/woodpecker-ci/woodpecker/pull/4402)] +- Add microsoft teams plugin [[#4400](https://github.com/woodpecker-ci/woodpecker/pull/4400)] +- fix(deps): update docs npm deps non-major [[#4394](https://github.com/woodpecker-ci/woodpecker/pull/4394)] +- chore(deps): update dependency @types/node to v22 [[#4395](https://github.com/woodpecker-ci/woodpecker/pull/4395)] +- chore(deps): update dependency marked to v15 [[#4396](https://github.com/woodpecker-ci/woodpecker/pull/4396)] +- Podman is not (official) supported [[#4367](https://github.com/woodpecker-ci/woodpecker/pull/4367)] +- Add EditorConfig-Checker Plugin to docs [[#4371](https://github.com/woodpecker-ci/woodpecker/pull/4371)] +- Update netrc option description [[#4342](https://github.com/woodpecker-ci/woodpecker/pull/4342)] +- Fix deployment event note [[#4283](https://github.com/woodpecker-ci/woodpecker/pull/4283)] +- Improve migration notes [[#4291](https://github.com/woodpecker-ci/woodpecker/pull/4291)] +- Add instructions how to build images locally [[#4277](https://github.com/woodpecker-ci/woodpecker/pull/4277)] +- chore(deps): update docs npm deps non-major [[#4238](https://github.com/woodpecker-ci/woodpecker/pull/4238)] +- Correct spelling [[#4279](https://github.com/woodpecker-ci/woodpecker/pull/4279)] +- Add Telegram plugin [[#4229](https://github.com/woodpecker-ci/woodpecker/pull/4229)] +- Remove archived plugin [[#4227](https://github.com/woodpecker-ci/woodpecker/pull/4227)] +- Use "Woodpecker Authors" as copyright on website [[#4225](https://github.com/woodpecker-ci/woodpecker/pull/4225)] +- chore(deps): update dependency cookie to v1 [[#4224](https://github.com/woodpecker-ci/woodpecker/pull/4224)] +- fix(deps): update docs npm deps non-major [[#4221](https://github.com/woodpecker-ci/woodpecker/pull/4221)] +- Fix errant apostrophe in docker-compose documentation [[#4203](https://github.com/woodpecker-ci/woodpecker/pull/4203)] +- chore(deps): lock file maintenance [[#4186](https://github.com/woodpecker-ci/woodpecker/pull/4186)] +- chore(deps): update dependency concurrently to v9 [[#4176](https://github.com/woodpecker-ci/woodpecker/pull/4176)] +- chore(deps): update docs npm deps non-major [[#4164](https://github.com/woodpecker-ci/woodpecker/pull/4164)] +- Update image filter error message [[#4143](https://github.com/woodpecker-ci/woodpecker/pull/4143)] +- Docs: reference to built-in docker compose and remove deprecated version from compose examples [[#4123](https://github.com/woodpecker-ci/woodpecker/pull/4123)] +- directory key is allowed for services [[#4127](https://github.com/woodpecker-ci/woodpecker/pull/4127)] +- [docs] Removes dot prefix from pipeline configuration filenames [[#4105](https://github.com/woodpecker-ci/woodpecker/pull/4105)] +- Use kaniko plugin in docs as example [[#4072](https://github.com/woodpecker-ci/woodpecker/pull/4072)] +- Add some posts and videos [[#4070](https://github.com/woodpecker-ci/woodpecker/pull/4070)] +- Move event type descriptions from Terminology to Workflow Syntax [[#4062](https://github.com/woodpecker-ci/woodpecker/pull/4062)] +- Add community posts from discussions [[#4058](https://github.com/woodpecker-ci/woodpecker/pull/4058)] +- Add a pull request template with some basic guidelines [[#4055](https://github.com/woodpecker-ci/woodpecker/pull/4055)] +- Add examples of CI environment variable values [[#4009](https://github.com/woodpecker-ci/woodpecker/pull/4009)] +- Fix inline author warning [[#4040](https://github.com/woodpecker-ci/woodpecker/pull/4040)] +- Updated Secrets image filter docs [[#4028](https://github.com/woodpecker-ci/woodpecker/pull/4028)] +- Update dependency marked to v14 [[#4036](https://github.com/woodpecker-ci/woodpecker/pull/4036)] +- Update docs npm deps non-major [[#4033](https://github.com/woodpecker-ci/woodpecker/pull/4033)] +- Overhaul README [[#3995](https://github.com/woodpecker-ci/woodpecker/pull/3995)] +- fix(deps): update docs npm deps non-major [[#3990](https://github.com/woodpecker-ci/woodpecker/pull/3990)] +- Add spellchecking for docs [[#3787](https://github.com/woodpecker-ci/woodpecker/pull/3787)] + +### 📈 Enhancement + +- Use docusaurus faster [[#4528](https://github.com/woodpecker-ci/woodpecker/pull/4528)] +- Use pagination helper to list pipelines in cli [[#4478](https://github.com/woodpecker-ci/woodpecker/pull/4478)] +- Some UI improvements [[#4497](https://github.com/woodpecker-ci/woodpecker/pull/4497)] +- Add status filter to list pipeline API [[#4494](https://github.com/woodpecker-ci/woodpecker/pull/4494)] +- Use JS-native date/time formatting [[#4488](https://github.com/woodpecker-ci/woodpecker/pull/4488)] +- Add pipeline purge command to cli [[#4470](https://github.com/woodpecker-ci/woodpecker/pull/4470)] +- Add option to limit the resultset returned by paginate helper [[#4475](https://github.com/woodpecker-ci/woodpecker/pull/4475)] +- Add filter to list repository pipelines API [[#4416](https://github.com/woodpecker-ci/woodpecker/pull/4416)] +- Increase log level when failing to fetch YAML [[#4107](https://github.com/woodpecker-ci/woodpecker/pull/4107)] +- Trim space to all config flags that allow to read value from file [[#4468](https://github.com/woodpecker-ci/woodpecker/pull/4468)] +- Change default icon size to 20 [[#4458](https://github.com/woodpecker-ci/woodpecker/pull/4458)] +- Add visibility icon to repo list [[#4460](https://github.com/woodpecker-ci/woodpecker/pull/4460)] +- Unify pipeline status icons [[#4414](https://github.com/woodpecker-ci/woodpecker/pull/4414)] +- Improve project settings descriptions [[#4410](https://github.com/woodpecker-ci/woodpecker/pull/4410)] +- Add count badge to visualize counters in tab title [[#4419](https://github.com/woodpecker-ci/woodpecker/pull/4419)] +- Redesign repo list and include last pipeline [[#4386](https://github.com/woodpecker-ci/woodpecker/pull/4386)] +- Use KeyValueEditor for DeployPipelinePopup too [[#4412](https://github.com/woodpecker-ci/woodpecker/pull/4412)] +- Use separate routes instead of anchors [[#4285](https://github.com/woodpecker-ci/woodpecker/pull/4285)] +- Untangle settings / header slots [[#4403](https://github.com/woodpecker-ci/woodpecker/pull/4403)] +- Fix responsiveness of the settings template [[#4383](https://github.com/woodpecker-ci/woodpecker/pull/4383)] +- Use squared spinner for active pipelines [[#4379](https://github.com/woodpecker-ci/woodpecker/pull/4379)] +- Add server configuration option to add default set of labels for workflows that has no labels specified [[#4326](https://github.com/woodpecker-ci/woodpecker/pull/4326)] +- Add `cli lint` option to treat warnings as errors [[#4373](https://github.com/woodpecker-ci/woodpecker/pull/4373)] +- Improve error message for wrong secrets / environment config [[#4359](https://github.com/woodpecker-ci/woodpecker/pull/4359)] +- Improve linter messages in UI [[#4351](https://github.com/woodpecker-ci/woodpecker/pull/4351)] +- Pass settings to services [[#4338](https://github.com/woodpecker-ci/woodpecker/pull/4338)] +- Inline model types for migrations [[#4293](https://github.com/woodpecker-ci/woodpecker/pull/4293)] +- Add options to control the database connections (open,idle,timeout) [[#4212](https://github.com/woodpecker-ci/woodpecker/pull/4212)] +- Move Queue creation behind new func that evaluates queue type [[#4252](https://github.com/woodpecker-ci/woodpecker/pull/4252)] +- Add additional error message on swagger v2 to v3 convert [[#4254](https://github.com/woodpecker-ci/woodpecker/pull/4254)] +- Deprecate `secrets` [[#4235](https://github.com/woodpecker-ci/woodpecker/pull/4235)] +- Agent edit/detail view: change the help url based on the backend [[#4219](https://github.com/woodpecker-ci/woodpecker/pull/4219)] +- Use middleware to load org [[#4208](https://github.com/woodpecker-ci/woodpecker/pull/4208)] +- Assign workflows to agents with the best label matches [[#4201](https://github.com/woodpecker-ci/woodpecker/pull/4201)] +- Report custom labels set by agent admins back [[#4141](https://github.com/woodpecker-ci/woodpecker/pull/4141)] +- Highlight invalid entries in manual pipeline trigger [[#4153](https://github.com/woodpecker-ci/woodpecker/pull/4153)] +- Print agent labels in debug mode [[#4155](https://github.com/woodpecker-ci/woodpecker/pull/4155)] +- Implement registries for Kubernetes backend [[#4092](https://github.com/woodpecker-ci/woodpecker/pull/4092)] +- Correct cli exec flags and remove ineffective ones [[#4129](https://github.com/woodpecker-ci/woodpecker/pull/4129)] +- Set repo user to repairing user when old user is missing [[#4128](https://github.com/woodpecker-ci/woodpecker/pull/4128)] +- Restart tasks on dead agents sooner [[#4114](https://github.com/woodpecker-ci/woodpecker/pull/4114)] +- Adjust cli exec metadata structure to equal server metadata [[#4119](https://github.com/woodpecker-ci/woodpecker/pull/4119)] +- Allow to restart declined pipelines [[#4109](https://github.com/woodpecker-ci/woodpecker/pull/4109)] +- Add indices to repo table [[#4087](https://github.com/woodpecker-ci/woodpecker/pull/4087)] +- Add systemd unit files to the RPM/DEB packages [[#3986](https://github.com/woodpecker-ci/woodpecker/pull/3986)] +- Duplicate key `workflow_id` in the agent logs [[#4046](https://github.com/woodpecker-ci/woodpecker/pull/4046)] +- Improve error on config loading [[#4024](https://github.com/woodpecker-ci/woodpecker/pull/4024)] +- Show error if secret name is missing [[#4014](https://github.com/woodpecker-ci/woodpecker/pull/4014)] +- Show error returned from API [[#3980](https://github.com/woodpecker-ci/woodpecker/pull/3980)] +- Move manual popup to own page [[#3981](https://github.com/woodpecker-ci/woodpecker/pull/3981)] +- Fail on InvalidImageName [[#4007](https://github.com/woodpecker-ci/woodpecker/pull/4007)] +- Use Bitbucket PR title for pipeline message [[#3984](https://github.com/woodpecker-ci/woodpecker/pull/3984)] +- Show logs if step has error [[#3979](https://github.com/woodpecker-ci/woodpecker/pull/3979)] +- Refactor docker backend and add more test coverage [[#2700](https://github.com/woodpecker-ci/woodpecker/pull/2700)] +- Make cli plugin log purge recognize steps by name [[#3953](https://github.com/woodpecker-ci/woodpecker/pull/3953)] +- Pin page size [[#3946](https://github.com/woodpecker-ci/woodpecker/pull/3946)] +- Improve cron list [[#3947](https://github.com/woodpecker-ci/woodpecker/pull/3947)] +- Add PULLREQUEST_DRONE_PULL_REQUEST drone env [[#3939](https://github.com/woodpecker-ci/woodpecker/pull/3939)] +- Make agent gRPC errors distinguishable [[#3936](https://github.com/woodpecker-ci/woodpecker/pull/3936)] + +### 📦️ Dependency + +- fix(deps): update module google.golang.org/grpc to v1.69.0 [[#4563](https://github.com/woodpecker-ci/woodpecker/pull/4563)] +- fix(deps): update golang-packages [[#4553](https://github.com/woodpecker-ci/woodpecker/pull/4553)] +- Update kin-openapi [[#4560](https://github.com/woodpecker-ci/woodpecker/pull/4560)] +- fix(deps): update module golang.org/x/crypto to v0.31.0 [security] [[#4557](https://github.com/woodpecker-ci/woodpecker/pull/4557)] +- fix(deps): update golang-packages [[#4546](https://github.com/woodpecker-ci/woodpecker/pull/4546)] +- chore(deps): update docker.io/woodpeckerci/plugin-ready-release-go docker tag to v3.1.0 [[#4536](https://github.com/woodpecker-ci/woodpecker/pull/4536)] +- chore(deps): update docker.io/curlimages/curl docker tag to v8.11.0 [[#4530](https://github.com/woodpecker-ci/woodpecker/pull/4530)] +- fix(deps): update golang-packages [[#4496](https://github.com/woodpecker-ci/woodpecker/pull/4496)] +- chore(deps): update docker.io/woodpeckerci/plugin-docker-buildx docker tag to v5.1.0 [[#4524](https://github.com/woodpecker-ci/woodpecker/pull/4524)] +- chore(deps): update docker.io/woodpeckerci/plugin-prettier docker tag to v1 [[#4522](https://github.com/woodpecker-ci/woodpecker/pull/4522)] +- chore(deps): update docker.io/alpine docker tag to v3.21 [[#4520](https://github.com/woodpecker-ci/woodpecker/pull/4520)] +- chore(deps): update dependency vite to v6 [[#4485](https://github.com/woodpecker-ci/woodpecker/pull/4485)] +- chore(deps): update docker.io/woodpeckerci/plugin-ready-release-go docker tag to v3 [[#4506](https://github.com/woodpecker-ci/woodpecker/pull/4506)] +- chore(deps): update docker.io/woodpeckerci/plugin-surge-preview docker tag to v1.3.3 [[#4495](https://github.com/woodpecker-ci/woodpecker/pull/4495)] +- fix(deps): update golang-packages [[#4477](https://github.com/woodpecker-ci/woodpecker/pull/4477)] +- fix(deps): update dependency @vueuse/core to v12 [[#4486](https://github.com/woodpecker-ci/woodpecker/pull/4486)] +- fix(deps): update module github.com/google/go-github/v66 to v67 [[#4487](https://github.com/woodpecker-ci/woodpecker/pull/4487)] +- chore(deps): update woodpeckerci/plugin-release docker tag to v0.2.2 [[#4483](https://github.com/woodpecker-ci/woodpecker/pull/4483)] +- chore(deps): update pre-commit hook golangci/golangci-lint to v1.62.2 [[#4482](https://github.com/woodpecker-ci/woodpecker/pull/4482)] +- fix(deps): update golang-packages [[#4452](https://github.com/woodpecker-ci/woodpecker/pull/4452)] +- fix(deps): update golang-packages [[#4411](https://github.com/woodpecker-ci/woodpecker/pull/4411)] +- chore(deps): update pre-commit hook igorshubovych/markdownlint-cli to v0.43.0 [[#4443](https://github.com/woodpecker-ci/woodpecker/pull/4443)] +- chore(deps): update postgres docker tag to v17.2 [[#4442](https://github.com/woodpecker-ci/woodpecker/pull/4442)] +- chore(deps): update docker.io/woodpeckerci/plugin-trivy docker tag to v1.3.0 [[#4434](https://github.com/woodpecker-ci/woodpecker/pull/4434)] +- chore(deps): update web npm deps non-major [[#4432](https://github.com/woodpecker-ci/woodpecker/pull/4432)] +- fix(deps): update golang-packages [[#4401](https://github.com/woodpecker-ci/woodpecker/pull/4401)] +- chore(deps): update web npm deps non-major [[#4391](https://github.com/woodpecker-ci/woodpecker/pull/4391)] +- fix(deps): update dependency @intlify/unplugin-vue-i18n to v6 [[#4397](https://github.com/woodpecker-ci/woodpecker/pull/4397)] +- chore(deps): update pre-commit hook golangci/golangci-lint to v1.62.0 [[#4390](https://github.com/woodpecker-ci/woodpecker/pull/4390)] +- chore(deps): update postgres docker tag to v17.1 [[#4389](https://github.com/woodpecker-ci/woodpecker/pull/4389)] +- chore(deps): update docker.io/techknowlogick/xgo docker tag to go-1.23.x [[#4388](https://github.com/woodpecker-ci/woodpecker/pull/4388)] +- chore(config): migrate renovate config [[#4296](https://github.com/woodpecker-ci/woodpecker/pull/4296)] +- chore(deps): update docker.io/woodpeckerci/plugin-trivy docker tag to v1.2.0 [[#4289](https://github.com/woodpecker-ci/woodpecker/pull/4289)] +- chore(deps): update docker.io/techknowlogick/xgo docker tag to go-1.23.x [[#4282](https://github.com/woodpecker-ci/woodpecker/pull/4282)] +- fix(deps): update golang-packages [[#4251](https://github.com/woodpecker-ci/woodpecker/pull/4251)] +- fix(deps): update web npm deps non-major [[#4258](https://github.com/woodpecker-ci/woodpecker/pull/4258)] +- chore(deps): update web npm deps non-major [[#4250](https://github.com/woodpecker-ci/woodpecker/pull/4250)] +- chore(deps): update node.js to v23 [[#4239](https://github.com/woodpecker-ci/woodpecker/pull/4239)] +- chore(deps): update web npm deps non-major [[#4237](https://github.com/woodpecker-ci/woodpecker/pull/4237)] +- chore(deps): update docker.io/mysql docker tag to v9.1.0 [[#4236](https://github.com/woodpecker-ci/woodpecker/pull/4236)] +- fix(deps): update dependency simple-icons to v13.14.0 [[#4226](https://github.com/woodpecker-ci/woodpecker/pull/4226)] +- fix(deps): update web npm deps non-major [[#4223](https://github.com/woodpecker-ci/woodpecker/pull/4223)] +- fix(deps): update golang-packages [[#4215](https://github.com/woodpecker-ci/woodpecker/pull/4215)] +- fix(deps): update golang-packages [[#4210](https://github.com/woodpecker-ci/woodpecker/pull/4210)] +- fix(deps): update module github.com/google/go-github/v65 to v66 [[#4205](https://github.com/woodpecker-ci/woodpecker/pull/4205)] +- fix(deps): update dependency vue-i18n to v10.0.4 [[#4200](https://github.com/woodpecker-ci/woodpecker/pull/4200)] +- chore(deps): update pre-commit hook pre-commit/pre-commit-hooks to v5 [[#4192](https://github.com/woodpecker-ci/woodpecker/pull/4192)] +- fix(deps): update dependency simple-icons to v13.13.0 [[#4196](https://github.com/woodpecker-ci/woodpecker/pull/4196)] +- chore(deps): update web npm deps non-major [[#4174](https://github.com/woodpecker-ci/woodpecker/pull/4174)] +- chore(deps): update docker.io/postgres docker tag to v17 [[#4179](https://github.com/woodpecker-ci/woodpecker/pull/4179)] +- fix(deps): update dependency @intlify/unplugin-vue-i18n to v5 [[#4183](https://github.com/woodpecker-ci/woodpecker/pull/4183)] +- fix(deps): update dependency @vueuse/core to v11 [[#4184](https://github.com/woodpecker-ci/woodpecker/pull/4184)] +- chore(deps): update docker.io/woodpeckerci/plugin-codecov docker tag to v2.1.5 [[#4167](https://github.com/woodpecker-ci/woodpecker/pull/4167)] +- fix(deps): update module github.com/google/go-github/v64 to v65 [[#4185](https://github.com/woodpecker-ci/woodpecker/pull/4185)] +- chore(deps): update docker.io/mysql docker tag to v9 [[#4178](https://github.com/woodpecker-ci/woodpecker/pull/4178)] +- chore(deps): update docker.io/alpine docker tag to v3.20 [[#4169](https://github.com/woodpecker-ci/woodpecker/pull/4169)] +- fix(deps): update github.com/urfave/cli/v3 digest to 20ef97b [[#4166](https://github.com/woodpecker-ci/woodpecker/pull/4166)] +- chore(deps): update docker.io/woodpeckerci/plugin-surge-preview docker tag to v1.3.2 [[#4168](https://github.com/woodpecker-ci/woodpecker/pull/4168)] +- chore(deps): update woodpeckerci/plugin-release docker tag to v0.2.1 [[#4175](https://github.com/woodpecker-ci/woodpecker/pull/4175)] +- chore(deps): update woodpeckerci/plugin-ready-release-go docker tag to v2 [[#4182](https://github.com/woodpecker-ci/woodpecker/pull/4182)] +- fix(deps): update github.com/muesli/termenv digest to 82936c5 [[#4165](https://github.com/woodpecker-ci/woodpecker/pull/4165)] +- chore(deps): update postgres docker tag to v17 [[#4181](https://github.com/woodpecker-ci/woodpecker/pull/4181)] +- chore(deps): update pre-commit non-major [[#4173](https://github.com/woodpecker-ci/woodpecker/pull/4173)] +- chore(deps): update docker.io/golang docker tag to v1.23 [[#4170](https://github.com/woodpecker-ci/woodpecker/pull/4170)] +- chore(deps): update node.js to v22 [[#4180](https://github.com/woodpecker-ci/woodpecker/pull/4180)] +- fix(deps): update golang-packages [[#4161](https://github.com/woodpecker-ci/woodpecker/pull/4161)] +- chore(deps): update dependency @antfu/eslint-config to v3 [[#4095](https://github.com/woodpecker-ci/woodpecker/pull/4095)] +- chore(deps): update dependency jsdom to v25 [[#4094](https://github.com/woodpecker-ci/woodpecker/pull/4094)] +- chore(deps): update docker.io/golang docker tag to v1.23 [[#4081](https://github.com/woodpecker-ci/woodpecker/pull/4081)] +- chore(deps): update docker.io/woodpeckerci/plugin-prettier docker tag to v0.2.0 [[#4082](https://github.com/woodpecker-ci/woodpecker/pull/4082)] +- fix(deps): update module github.com/google/go-github/v63 to v64 [[#4073](https://github.com/woodpecker-ci/woodpecker/pull/4073)] +- fix(deps): update golang-packages [[#4059](https://github.com/woodpecker-ci/woodpecker/pull/4059)] +- Update github.com/urfave/cli/v3 digest to fc07a8c [[#4043](https://github.com/woodpecker-ci/woodpecker/pull/4043)] +- Update woodpeckerci/plugin-git Docker tag to v2.5.2 [[#4041](https://github.com/woodpecker-ci/woodpecker/pull/4041)] +- Update web npm deps non-major [[#4034](https://github.com/woodpecker-ci/woodpecker/pull/4034)] +- Update dependency simple-icons to v13 [[#4037](https://github.com/woodpecker-ci/woodpecker/pull/4037)] +- chore(deps): lock file maintenance [[#3991](https://github.com/woodpecker-ci/woodpecker/pull/3991)] +- fix(deps): update golang-packages [[#3958](https://github.com/woodpecker-ci/woodpecker/pull/3958)] + +### Misc + +- Move link checks into cron-curated issue dashboard [[#4515](https://github.com/woodpecker-ci/woodpecker/pull/4515)] +- Add settings title action [[#4499](https://github.com/woodpecker-ci/woodpecker/pull/4499)] +- Use same default sort for repo and org repo list [[#4461](https://github.com/woodpecker-ci/woodpecker/pull/4461)] +- Add dns config option to official feature set [[#4418](https://github.com/woodpecker-ci/woodpecker/pull/4418)] +- Remove `renovate` branch triggers [[#4437](https://github.com/woodpecker-ci/woodpecker/pull/4437)] +- Improve tab layout and add hover effect [[#4431](https://github.com/woodpecker-ci/woodpecker/pull/4431)] +- Dont run pipeline on push events to renovate branches [[#4406](https://github.com/woodpecker-ci/woodpecker/pull/4406)] +- Harden and correct fifo task queue tests [[#4377](https://github.com/woodpecker-ci/woodpecker/pull/4377)] +- Kubernetes documentation enhancements [[#4374](https://github.com/woodpecker-ci/woodpecker/pull/4374)] +- Use release-helper for release/* branches [[#4301](https://github.com/woodpecker-ci/woodpecker/pull/4301)] +- Fix wording for privileged plugins linter error [[#4280](https://github.com/woodpecker-ci/woodpecker/pull/4280)] +- Fix renovate support for `xgo` [[#4276](https://github.com/woodpecker-ci/woodpecker/pull/4276)] +- Improve nix development environment [[#4256](https://github.com/woodpecker-ci/woodpecker/pull/4256)] +- [pre-commit.ci] pre-commit autoupdate [[#4209](https://github.com/woodpecker-ci/woodpecker/pull/4209)] +- Add `.lycheeignore` [[#4154](https://github.com/woodpecker-ci/woodpecker/pull/4154)] +- Add eslint-plugin-promise back [[#4022](https://github.com/woodpecker-ci/woodpecker/pull/4022)] +- Improve wording [[#3951](https://github.com/woodpecker-ci/woodpecker/pull/3951)] +- Fix typos and optimize wording [[#3940](https://github.com/woodpecker-ci/woodpecker/pull/3940)] + ## [2.7.2](https://github.com/woodpecker-ci/woodpecker/releases/tag/v2.7.2) - 2024-11-03 ### Important diff --git a/Makefile b/Makefile index dadacae45..a9cf6bb42 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ else endif TAGS ?= -LDFLAGS := -X go.woodpecker-ci.org/woodpecker/v2/version.Version=${VERSION} +LDFLAGS := -X go.woodpecker-ci.org/woodpecker/v3/version.Version=${VERSION} STATIC_BUILD ?= true ifeq ($(STATIC_BUILD),true) LDFLAGS := -s -w -extldflags "-static" $(LDFLAGS) @@ -161,20 +161,20 @@ lint-ui: ui-dependencies ## Lint UI code (cd web/; pnpm lint --quiet) test-agent: ## Test agent code - go test -race -cover -coverprofile agent-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v2/cmd/agent go.woodpecker-ci.org/woodpecker/v2/agent/... + go test -race -cover -coverprofile agent-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v3/cmd/agent go.woodpecker-ci.org/woodpecker/v3/agent/... test-server: ## Test server code - go test -race -cover -coverprofile server-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v2/cmd/server $(shell go list go.woodpecker-ci.org/woodpecker/v2/server/... | grep -v '/store') + go test -race -cover -coverprofile server-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v3/cmd/server $(shell go list go.woodpecker-ci.org/woodpecker/v3/server/... | grep -v '/store') test-cli: ## Test cli code - go test -race -cover -coverprofile cli-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v2/cmd/cli go.woodpecker-ci.org/woodpecker/v2/cli/... + go test -race -cover -coverprofile cli-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v3/cmd/cli go.woodpecker-ci.org/woodpecker/v3/cli/... test-server-datastore: ## Test server datastore - go test -timeout 300s -tags 'test $(TAGS)' -run TestMigrate go.woodpecker-ci.org/woodpecker/v2/server/store/... - go test -race -timeout 100s -tags 'test $(TAGS)' -skip TestMigrate go.woodpecker-ci.org/woodpecker/v2/server/store/... + go test -timeout 300s -tags 'test $(TAGS)' -run TestMigrate go.woodpecker-ci.org/woodpecker/v3/server/store/... + go test -race -timeout 100s -tags 'test $(TAGS)' -skip TestMigrate go.woodpecker-ci.org/woodpecker/v3/server/store/... test-server-datastore-coverage: ## Test server datastore with coverage report - go test -race -cover -coverprofile datastore-coverage.out -timeout 300s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v2/server/store/... + go test -race -cover -coverprofile datastore-coverage.out -timeout 300s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v3/server/store/... test-ui: ui-dependencies ## Test UI code (cd web/; pnpm run lint) @@ -194,13 +194,13 @@ build-ui: ## Build UI (cd web/; pnpm install --frozen-lockfile; pnpm build) build-server: build-ui generate-openapi ## Build server - CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-server${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v2/cmd/server + CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-server${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v3/cmd/server build-agent: ## Build agent - CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-agent${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v2/cmd/agent + CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-agent${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v3/cmd/agent build-cli: ## Build cli - CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-cli${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v2/cmd/cli + CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-cli${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v3/cmd/cli build-tarball: ## Build tar archive mkdir -p ${DIST_DIR} && tar chzvf ${DIST_DIR}/woodpecker-src.tar.gz \ @@ -259,7 +259,7 @@ release-server-xgo: check-xgo ## Create server binaries for release using xgo release-server: ## Create server binaries for release # compile - GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/server/$(TARGETOS)_$(TARGETARCH)/woodpecker-server$(BIN_SUFFIX) go.woodpecker-ci.org/woodpecker/v2/cmd/server + GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/server/$(TARGETOS)_$(TARGETARCH)/woodpecker-server$(BIN_SUFFIX) go.woodpecker-ci.org/woodpecker/v3/cmd/server # tar binary files if [ "$(BIN_SUFFIX)" == ".exe" ]; then \ zip -j ${DIST_DIR}/woodpecker-server_$(TARGETOS)_$(TARGETARCH).zip ${DIST_DIR}/server/$(TARGETOS)_$(TARGETARCH)/woodpecker-server.exe; \ @@ -269,12 +269,12 @@ release-server: ## Create server binaries for release release-agent: ## Create agent binaries for release # compile - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent - GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent - GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_arm/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/windows_amd64/woodpecker-agent.exe go.woodpecker-ci.org/woodpecker/v2/cmd/agent - GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/darwin_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent - GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/darwin_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_arm/woodpecker-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/windows_amd64/woodpecker-agent.exe go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/darwin_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/darwin_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent # tar binary files tar -cvzf ${DIST_DIR}/woodpecker-agent_linux_amd64.tar.gz -C ${DIST_DIR}/agent/linux_amd64 woodpecker-agent tar -cvzf ${DIST_DIR}/woodpecker-agent_linux_arm64.tar.gz -C ${DIST_DIR}/agent/linux_arm64 woodpecker-agent @@ -287,12 +287,12 @@ release-agent: ## Create agent binaries for release release-cli: ## Create cli binaries for release # compile - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli - GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli - GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_arm/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/windows_amd64/woodpecker-cli.exe go.woodpecker-ci.org/woodpecker/v2/cmd/cli - GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/darwin_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli - GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/darwin_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_arm/woodpecker-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/windows_amd64/woodpecker-cli.exe go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/darwin_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/darwin_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli # tar binary files tar -cvzf ${DIST_DIR}/woodpecker-cli_linux_amd64.tar.gz -C ${DIST_DIR}/cli/linux_amd64 woodpecker-cli tar -cvzf ${DIST_DIR}/woodpecker-cli_linux_arm64.tar.gz -C ${DIST_DIR}/cli/linux_arm64 woodpecker-cli diff --git a/README.md b/README.md index 1386dc7c1..9806ceb33 100644 --- a/README.md +++ b/README.md @@ -19,11 +19,11 @@ Matrix space - - Go Report Card + + Go Report Card - - go reference + + go reference GitHub release diff --git a/agent/logger.go b/agent/logger.go index 7e3469fd6..47413df90 100644 --- a/agent/logger.go +++ b/agent/logger.go @@ -20,10 +20,10 @@ import ( "github.com/rs/zerolog" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/log" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" ) func (r *Runner) createLogger(_logger zerolog.Logger, uploads *sync.WaitGroup, workflow *rpc.Workflow) pipeline.Logger { diff --git a/agent/rpc/auth_client_grpc.go b/agent/rpc/auth_client_grpc.go index 55c89a41a..7abc7835d 100644 --- a/agent/rpc/auth_client_grpc.go +++ b/agent/rpc/auth_client_grpc.go @@ -20,7 +20,7 @@ import ( "google.golang.org/grpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/proto" ) const authClientTimeout = time.Second * 5 diff --git a/agent/rpc/client_grpc.go b/agent/rpc/client_grpc.go index 74114f8dc..29c552e2a 100644 --- a/agent/rpc/client_grpc.go +++ b/agent/rpc/client_grpc.go @@ -20,16 +20,16 @@ import ( "strings" "time" - "github.com/cenkalti/backoff/v4" + "github.com/cenkalti/backoff/v5" "github.com/rs/zerolog/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" grpcproto "google.golang.org/protobuf/proto" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/proto" ) const ( @@ -68,7 +68,6 @@ func (c *client) Close() error { func (c *client) newBackOff() backoff.BackOff { b := backoff.NewExponentialBackOff() - b.MaxElapsedTime = 0 b.MaxInterval = 10 * time.Second //nolint:mnd b.InitialInterval = 10 * time.Millisecond //nolint:mnd return b diff --git a/agent/runner.go b/agent/runner.go index 27363aa66..f5640982e 100644 --- a/agent/runner.go +++ b/agent/runner.go @@ -25,11 +25,11 @@ import ( "github.com/rs/zerolog/log" "google.golang.org/grpc/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) type Runner struct { diff --git a/agent/tracer.go b/agent/tracer.go index ff8f23c38..a3af590d3 100644 --- a/agent/tracer.go +++ b/agent/tracer.go @@ -23,8 +23,8 @@ import ( "github.com/rs/zerolog" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" ) func (r *Runner) createTracer(ctxMeta context.Context, uploads *sync.WaitGroup, logger zerolog.Logger, workflow *rpc.Workflow) pipeline.TraceFunc { diff --git a/cli/admin/admin.go b/cli/admin/admin.go index f99b79f0f..110c210d4 100644 --- a/cli/admin/admin.go +++ b/cli/admin/admin.go @@ -17,10 +17,10 @@ package admin import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/admin/loglevel" - "go.woodpecker-ci.org/woodpecker/v2/cli/admin/registry" - "go.woodpecker-ci.org/woodpecker/v2/cli/admin/secret" - "go.woodpecker-ci.org/woodpecker/v2/cli/admin/user" + "go.woodpecker-ci.org/woodpecker/v3/cli/admin/loglevel" + "go.woodpecker-ci.org/woodpecker/v3/cli/admin/registry" + "go.woodpecker-ci.org/woodpecker/v3/cli/admin/secret" + "go.woodpecker-ci.org/woodpecker/v3/cli/admin/user" ) // Command exports the admin command set. diff --git a/cli/admin/loglevel/loglevel.go b/cli/admin/loglevel/loglevel.go index 323974d01..aac46af36 100644 --- a/cli/admin/loglevel/loglevel.go +++ b/cli/admin/loglevel/loglevel.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the log-level command used to change the servers log-level. diff --git a/cli/admin/registry/registry_add.go b/cli/admin/registry/registry_add.go index b09f8a74e..756bcc9dd 100644 --- a/cli/admin/registry/registry_add.go +++ b/cli/admin/registry/registry_add.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryCreateCmd = &cli.Command{ diff --git a/cli/admin/registry/registry_list.go b/cli/admin/registry/registry_list.go index 72332b9a0..cef4af5b4 100644 --- a/cli/admin/registry/registry_list.go +++ b/cli/admin/registry/registry_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryListCmd = &cli.Command{ diff --git a/cli/admin/registry/registry_rm.go b/cli/admin/registry/registry_rm.go index 3dfb02c1f..296135694 100644 --- a/cli/admin/registry/registry_rm.go +++ b/cli/admin/registry/registry_rm.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryDeleteCmd = &cli.Command{ diff --git a/cli/admin/registry/registry_set.go b/cli/admin/registry/registry_set.go index 4196a982d..dca865e93 100644 --- a/cli/admin/registry/registry_set.go +++ b/cli/admin/registry/registry_set.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryUpdateCmd = &cli.Command{ diff --git a/cli/admin/registry/registry_show.go b/cli/admin/registry/registry_show.go index c7ae1359d..bf6561ed7 100644 --- a/cli/admin/registry/registry_show.go +++ b/cli/admin/registry/registry_show.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryShowCmd = &cli.Command{ diff --git a/cli/admin/secret/secret_add.go b/cli/admin/secret/secret_add.go index 07afa8134..ad65c00db 100644 --- a/cli/admin/secret/secret_add.go +++ b/cli/admin/secret/secret_add.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretCreateCmd = &cli.Command{ diff --git a/cli/admin/secret/secret_list.go b/cli/admin/secret/secret_list.go index d8d7374f0..ee00567fc 100644 --- a/cli/admin/secret/secret_list.go +++ b/cli/admin/secret/secret_list.go @@ -22,9 +22,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretListCmd = &cli.Command{ diff --git a/cli/admin/secret/secret_rm.go b/cli/admin/secret/secret_rm.go index f919d6b9d..596672d3a 100644 --- a/cli/admin/secret/secret_rm.go +++ b/cli/admin/secret/secret_rm.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretDeleteCmd = &cli.Command{ diff --git a/cli/admin/secret/secret_set.go b/cli/admin/secret/secret_set.go index 452826115..7e86d66e2 100644 --- a/cli/admin/secret/secret_set.go +++ b/cli/admin/secret/secret_set.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretUpdateCmd = &cli.Command{ diff --git a/cli/admin/secret/secret_show.go b/cli/admin/secret/secret_show.go index 09ce610b8..b5b9855b9 100644 --- a/cli/admin/secret/secret_show.go +++ b/cli/admin/secret/secret_show.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretShowCmd = &cli.Command{ diff --git a/cli/admin/user/user_add.go b/cli/admin/user/user_add.go index b05b5f6a9..aecf11e9d 100644 --- a/cli/admin/user/user_add.go +++ b/cli/admin/user/user_add.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var userAddCmd = &cli.Command{ diff --git a/cli/admin/user/user_list.go b/cli/admin/user/user_list.go index 894ec02df..baa436861 100644 --- a/cli/admin/user/user_list.go +++ b/cli/admin/user/user_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var userListCmd = &cli.Command{ diff --git a/cli/admin/user/user_rm.go b/cli/admin/user/user_rm.go index 962fc03a1..f6f4a7cdc 100644 --- a/cli/admin/user/user_rm.go +++ b/cli/admin/user/user_rm.go @@ -20,7 +20,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var userRemoveCmd = &cli.Command{ diff --git a/cli/admin/user/user_show.go b/cli/admin/user/user_show.go index 6ed453fc8..9f45d5a13 100644 --- a/cli/admin/user/user_show.go +++ b/cli/admin/user/user_show.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var userShowCmd = &cli.Command{ diff --git a/cli/common/flags.go b/cli/common/flags.go index db972762d..5cada2671 100644 --- a/cli/common/flags.go +++ b/cli/common/flags.go @@ -17,7 +17,7 @@ package common import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" ) var GlobalFlags = append([]cli.Flag{ diff --git a/cli/common/hooks.go b/cli/common/hooks.go index d35dd2fd6..fb7a4b4c7 100644 --- a/cli/common/hooks.go +++ b/cli/common/hooks.go @@ -8,8 +8,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal/config" - "go.woodpecker-ci.org/woodpecker/v2/cli/update" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal/config" + "go.woodpecker-ci.org/woodpecker/v3/cli/update" ) var ( diff --git a/cli/common/pipeline.go b/cli/common/pipeline.go index fba8cb54a..ba560ba1e 100644 --- a/cli/common/pipeline.go +++ b/cli/common/pipeline.go @@ -22,7 +22,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) func DetectPipelineConfig() (isDir bool, config string, _ error) { diff --git a/cli/common/zerologger.go b/cli/common/zerologger.go index 7c932c83d..e27682023 100644 --- a/cli/common/zerologger.go +++ b/cli/common/zerologger.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" ) func setupGlobalLogger(ctx context.Context, c *cli.Command) error { diff --git a/cli/exec/dummy.go b/cli/exec/dummy.go index edb544598..757bd9519 100644 --- a/cli/exec/dummy.go +++ b/cli/exec/dummy.go @@ -17,7 +17,7 @@ package exec -import "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/dummy" +import "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/dummy" func init() { //nolint:gochecknoinits backends = append(backends, dummy.New()) diff --git a/cli/exec/exec.go b/cli/exec/exec.go index 0b1462d6c..43bd57388 100644 --- a/cli/exec/exec.go +++ b/cli/exec/exec.go @@ -29,22 +29,22 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/lint" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/docker" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/kubernetes" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/local" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" - pipelineLog "go.woodpecker-ci.org/woodpecker/v2/pipeline/log" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/lint" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/docker" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/kubernetes" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/local" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/compiler" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/matrix" + pipelineLog "go.woodpecker-ci.org/woodpecker/v3/pipeline/log" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) // Command exports the exec command. diff --git a/cli/exec/flags.go b/cli/exec/flags.go index d50376bdb..10518d32b 100644 --- a/cli/exec/flags.go +++ b/cli/exec/flags.go @@ -157,12 +157,6 @@ var flags = []cli.Flag{ Name: "repo-url", Usage: "Set the metadata environment variable \"CI_REPO_URL\".", }, - &cli.StringFlag{ - Sources: cli.EnvVars("CI_REPO_SCM"), - Name: "repo-scm", - Usage: "Set the metadata environment variable \"CI_REPO_SCM\".", - Value: "git", - }, &cli.StringFlag{ Sources: cli.EnvVars("CI_REPO_DEFAULT_BRANCH"), Name: "repo-default-branch", diff --git a/cli/exec/metadata.go b/cli/exec/metadata.go index 799e843a4..8664ec2c4 100644 --- a/cli/exec/metadata.go +++ b/cli/exec/metadata.go @@ -24,9 +24,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/matrix" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // return the metadata from the cli context. @@ -78,7 +78,6 @@ func metadataFromContext(_ context.Context, c *cli.Command, axis matrix.Axis, w // Repo metadataFileAndOverrideOrDefault(c, "repo-remote-id", func(s string) { m.Repo.RemoteID = s }, c.String) metadataFileAndOverrideOrDefault(c, "repo-url", func(s string) { m.Repo.ForgeURL = s }, c.String) - metadataFileAndOverrideOrDefault(c, "repo-scm", func(s string) { m.Repo.SCM = s }, c.String) metadataFileAndOverrideOrDefault(c, "repo-default-branch", func(s string) { m.Repo.Branch = s }, c.String) metadataFileAndOverrideOrDefault(c, "repo-clone-url", func(s string) { m.Repo.CloneURL = s }, c.String) metadataFileAndOverrideOrDefault(c, "repo-clone-ssh-url", func(s string) { m.Repo.CloneSSHURL = s }, c.String) diff --git a/cli/exec/metadata_test.go b/cli/exec/metadata_test.go index 188426e8d..231dc9cb2 100644 --- a/cli/exec/metadata_test.go +++ b/cli/exec/metadata_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/matrix" ) func TestMetadataFromContext(t *testing.T) { diff --git a/cli/info/info.go b/cli/info/info.go index 2d17680d4..06f81e1c4 100644 --- a/cli/info/info.go +++ b/cli/info/info.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) // Command exports the info command. diff --git a/cli/internal/util.go b/cli/internal/util.go index e705dc9f9..e1367dfd5 100644 --- a/cli/internal/util.go +++ b/cli/internal/util.go @@ -30,7 +30,7 @@ import ( "golang.org/x/net/proxy" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // NewClient returns a new client from the CLI context. diff --git a/cli/lint/lint.go b/cli/lint/lint.go index b52175daa..832a508bd 100644 --- a/cli/lint/lint.go +++ b/cli/lint/lint.go @@ -24,10 +24,10 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) // Command exports the info command. diff --git a/cli/lint/utils.go b/cli/lint/utils.go index c6b5a95ba..bfa29c6c0 100644 --- a/cli/lint/utils.go +++ b/cli/lint/utils.go @@ -7,7 +7,7 @@ import ( term_env "github.com/muesli/termenv" - pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" ) func FormatLintError(file string, err error, strict bool) (string, error) { diff --git a/cli/org/org.go b/cli/org/org.go index 2b3aacf28..1c03978df 100644 --- a/cli/org/org.go +++ b/cli/org/org.go @@ -17,8 +17,8 @@ package org import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/org/registry" - "go.woodpecker-ci.org/woodpecker/v2/cli/org/secret" + "go.woodpecker-ci.org/woodpecker/v3/cli/org/registry" + "go.woodpecker-ci.org/woodpecker/v3/cli/org/secret" ) // Command exports the org command set. diff --git a/cli/org/registry/registry.go b/cli/org/registry/registry.go index 38ca0454e..4788deb91 100644 --- a/cli/org/registry/registry.go +++ b/cli/org/registry/registry.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the registry command set. diff --git a/cli/org/registry/registry_add.go b/cli/org/registry/registry_add.go index e6b184bcf..c15990b42 100644 --- a/cli/org/registry/registry_add.go +++ b/cli/org/registry/registry_add.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryCreateCmd = &cli.Command{ diff --git a/cli/org/registry/registry_list.go b/cli/org/registry/registry_list.go index a905d2128..ca036a806 100644 --- a/cli/org/registry/registry_list.go +++ b/cli/org/registry/registry_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryListCmd = &cli.Command{ diff --git a/cli/org/registry/registry_rm.go b/cli/org/registry/registry_rm.go index 8157e1626..151cf1b9d 100644 --- a/cli/org/registry/registry_rm.go +++ b/cli/org/registry/registry_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryDeleteCmd = &cli.Command{ diff --git a/cli/org/registry/registry_set.go b/cli/org/registry/registry_set.go index e08e2af4f..08d8f829f 100644 --- a/cli/org/registry/registry_set.go +++ b/cli/org/registry/registry_set.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryUpdateCmd = &cli.Command{ diff --git a/cli/org/registry/registry_show.go b/cli/org/registry/registry_show.go index 8fd7a77f0..ede2994e5 100644 --- a/cli/org/registry/registry_show.go +++ b/cli/org/registry/registry_show.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryShowCmd = &cli.Command{ diff --git a/cli/org/secret/secret.go b/cli/org/secret/secret.go index b50880c91..af53be6ed 100644 --- a/cli/org/secret/secret.go +++ b/cli/org/secret/secret.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the secret command. diff --git a/cli/org/secret/secret_add.go b/cli/org/secret/secret_add.go index d356773f1..a0a83ef80 100644 --- a/cli/org/secret/secret_add.go +++ b/cli/org/secret/secret_add.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretCreateCmd = &cli.Command{ diff --git a/cli/org/secret/secret_list.go b/cli/org/secret/secret_list.go index f33aaaa8a..bba6079e9 100644 --- a/cli/org/secret/secret_list.go +++ b/cli/org/secret/secret_list.go @@ -22,9 +22,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretListCmd = &cli.Command{ diff --git a/cli/org/secret/secret_rm.go b/cli/org/secret/secret_rm.go index 0b0f4db39..37b2fe8fa 100644 --- a/cli/org/secret/secret_rm.go +++ b/cli/org/secret/secret_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretDeleteCmd = &cli.Command{ diff --git a/cli/org/secret/secret_set.go b/cli/org/secret/secret_set.go index 4357d3296..cb784c316 100644 --- a/cli/org/secret/secret_set.go +++ b/cli/org/secret/secret_set.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretUpdateCmd = &cli.Command{ diff --git a/cli/org/secret/secret_show.go b/cli/org/secret/secret_show.go index 9a78741c2..86790c42b 100644 --- a/cli/org/secret/secret_show.go +++ b/cli/org/secret/secret_show.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretShowCmd = &cli.Command{ diff --git a/cli/output/table.go b/cli/output/table.go index a2b9a87c1..9fff467df 100644 --- a/cli/output/table.go +++ b/cli/output/table.go @@ -9,7 +9,7 @@ import ( "text/tabwriter" "unicode" - "github.com/mitchellh/mapstructure" + "github.com/go-viper/mapstructure/v2" ) // NewTable creates a new Table. diff --git a/cli/pipeline/approve.go b/cli/pipeline/approve.go index ae99324f5..299d7c10d 100644 --- a/cli/pipeline/approve.go +++ b/cli/pipeline/approve.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var pipelineApproveCmd = &cli.Command{ diff --git a/cli/pipeline/create.go b/cli/pipeline/create.go index 7f079f818..b317d4b3c 100644 --- a/cli/pipeline/create.go +++ b/cli/pipeline/create.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var pipelineCreateCmd = &cli.Command{ diff --git a/cli/pipeline/decline.go b/cli/pipeline/decline.go index f44179ba8..330515314 100644 --- a/cli/pipeline/decline.go +++ b/cli/pipeline/decline.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var pipelineDeclineCmd = &cli.Command{ diff --git a/cli/pipeline/deploy/deploy.go b/cli/pipeline/deploy/deploy.go index 199310ac6..110c675c5 100644 --- a/cli/pipeline/deploy/deploy.go +++ b/cli/pipeline/deploy/deploy.go @@ -23,9 +23,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the deploy command. diff --git a/cli/pipeline/kill.go b/cli/pipeline/kill.go index 839d7c75e..ac72899b7 100644 --- a/cli/pipeline/kill.go +++ b/cli/pipeline/kill.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var pipelineKillCmd = &cli.Command{ diff --git a/cli/pipeline/last.go b/cli/pipeline/last.go index 68e6cbb2f..3b3b4e315 100644 --- a/cli/pipeline/last.go +++ b/cli/pipeline/last.go @@ -19,9 +19,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var pipelineLastCmd = &cli.Command{ diff --git a/cli/pipeline/list.go b/cli/pipeline/list.go index 930e0e84f..312456a7a 100644 --- a/cli/pipeline/list.go +++ b/cli/pipeline/list.go @@ -20,10 +20,10 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) //nolint:mnd diff --git a/cli/pipeline/list_test.go b/cli/pipeline/list_test.go index 4668b2fb3..969e06794 100644 --- a/cli/pipeline/list_test.go +++ b/cli/pipeline/list_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker/mocks" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker/mocks" ) func TestPipelineList(t *testing.T) { diff --git a/cli/pipeline/log/log_purge.go b/cli/pipeline/log/log_purge.go index 44070289b..80cd0d55f 100644 --- a/cli/pipeline/log/log_purge.go +++ b/cli/pipeline/log/log_purge.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var logPurgeCmd = &cli.Command{ diff --git a/cli/pipeline/log/log_show.go b/cli/pipeline/log/log_show.go index e9de7a747..86931e31e 100644 --- a/cli/pipeline/log/log_show.go +++ b/cli/pipeline/log/log_show.go @@ -23,8 +23,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var logShowCmd = &cli.Command{ diff --git a/cli/pipeline/pipeline.go b/cli/pipeline/pipeline.go index 04bd256df..efcae8553 100644 --- a/cli/pipeline/pipeline.go +++ b/cli/pipeline/pipeline.go @@ -22,10 +22,10 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/output" - "go.woodpecker-ci.org/woodpecker/v2/cli/pipeline/deploy" - "go.woodpecker-ci.org/woodpecker/v2/cli/pipeline/log" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/output" + "go.woodpecker-ci.org/woodpecker/v3/cli/pipeline/deploy" + "go.woodpecker-ci.org/woodpecker/v3/cli/pipeline/log" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the pipeline command set. diff --git a/cli/pipeline/pipeline_test.go b/cli/pipeline/pipeline_test.go index 4bbe52b31..5238a19fe 100644 --- a/cli/pipeline/pipeline_test.go +++ b/cli/pipeline/pipeline_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) func TestPipelineOutput(t *testing.T) { diff --git a/cli/pipeline/ps.go b/cli/pipeline/ps.go index 5468d480a..f2836d7c3 100644 --- a/cli/pipeline/ps.go +++ b/cli/pipeline/ps.go @@ -23,9 +23,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var pipelinePsCmd = &cli.Command{ diff --git a/cli/pipeline/purge.go b/cli/pipeline/purge.go index a9c5e39d1..0e22537f3 100644 --- a/cli/pipeline/purge.go +++ b/cli/pipeline/purge.go @@ -1,4 +1,4 @@ -// Copyright 2022 Woodpecker Authors +// Copyright 2024 Woodpecker Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,15 +16,17 @@ package pipeline import ( "context" + "errors" "fmt" + "net/http" "time" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) //nolint:mnd @@ -96,13 +98,13 @@ func pipelinePurge(c *cli.Command, client woodpecker.Client) (err error) { // Create a map of pipeline IDs to keep keepMap := make(map[int64]struct{}) for _, p := range pipelinesKeep { - keepMap[p.ID] = struct{}{} + keepMap[p.Number] = struct{}{} } // Filter pipelines to only include those not in keepMap var pipelinesToPurge []*woodpecker.Pipeline for _, p := range pipelines { - if _, exists := keepMap[p.ID]; !exists { + if _, exists := keepMap[p.Number]; !exists { pipelinesToPurge = append(pipelinesToPurge, p) } } @@ -114,13 +116,18 @@ func pipelinePurge(c *cli.Command, client woodpecker.Client) (err error) { for i, p := range pipelinesToPurge { // cspell:words spurge - log.Debug().Msgf("%spurge %v/%v pipelines from repo '%v'", msgPrefix, i+1, len(pipelinesToPurge), repoIDOrFullName) + log.Debug().Msgf("%spurge %v/%v pipelines from repo '%v' (pipeline %v)", msgPrefix, i+1, len(pipelinesToPurge), repoIDOrFullName, p.Number) if dryRun { continue } - err := client.PipelineDelete(repoID, p.ID) + err := client.PipelineDelete(repoID, p.Number) if err != nil { + var clientErr *woodpecker.ClientError + if errors.As(err, &clientErr) && clientErr.StatusCode == http.StatusUnprocessableEntity { + log.Error().Err(err).Msgf("failed to delete pipeline %d", p.Number) + continue + } return err } } @@ -150,7 +157,7 @@ func fetchPipelines(client woodpecker.Client, repoID int64, duration time.Durati ListOptions: woodpecker.ListOptions{ Page: page, }, - After: time.Now().Add(-duration), + Before: time.Now().Add(-duration), }, ) }, -1) diff --git a/cli/pipeline/purge_test.go b/cli/pipeline/purge_test.go index be185277b..b6e285492 100644 --- a/cli/pipeline/purge_test.go +++ b/cli/pipeline/purge_test.go @@ -10,26 +10,27 @@ import ( "github.com/stretchr/testify/mock" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker/mocks" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker/mocks" ) func TestPipelinePurge(t *testing.T) { tests := []struct { - name string - repoID int64 - args []string - pipelinesKeep []*woodpecker.Pipeline - pipelines []*woodpecker.Pipeline - wantDelete int - wantErr error + name string + repoID int64 + args []string + pipelinesKeep []*woodpecker.Pipeline + pipelines []*woodpecker.Pipeline + mockDeleteError error + wantDelete int + wantErr error }{ { name: "success with no pipelines to purge", repoID: 1, args: []string{"purge", "--older-than", "1h", "repo/name"}, pipelinesKeep: []*woodpecker.Pipeline{ - {ID: 1}, + {Number: 1}, }, pipelines: []*woodpecker.Pipeline{}, }, @@ -38,12 +39,12 @@ func TestPipelinePurge(t *testing.T) { repoID: 1, args: []string{"purge", "--older-than", "1h", "repo/name"}, pipelinesKeep: []*woodpecker.Pipeline{ - {ID: 1}, + {Number: 1}, }, pipelines: []*woodpecker.Pipeline{ - {ID: 1}, - {ID: 2}, - {ID: 3}, + {Number: 1}, + {Number: 2}, + {Number: 3}, }, wantDelete: 2, }, @@ -53,6 +54,24 @@ func TestPipelinePurge(t *testing.T) { args: []string{"purge", "--older-than", "invalid", "repo/name"}, wantErr: errors.New("time: invalid duration \"invalid\""), }, + { + name: "continue on 422 error", + repoID: 1, + args: []string{"purge", "--older-than", "1h", "repo/name"}, + pipelinesKeep: []*woodpecker.Pipeline{ + {Number: 1}, + }, + pipelines: []*woodpecker.Pipeline{ + {Number: 1}, + {Number: 2}, + {Number: 3}, + }, + wantDelete: 2, + mockDeleteError: &woodpecker.ClientError{ + StatusCode: 422, + Message: "test error", + }, + }, } for _, tt := range tests { @@ -62,15 +81,15 @@ func TestPipelinePurge(t *testing.T) { mockClient.On("PipelineList", mock.Anything, mock.Anything).Return(func(_ int64, opt woodpecker.PipelineListOptions) ([]*woodpecker.Pipeline, error) { // Return keep pipelines for first call - if opt.After.IsZero() { + if opt.Before.IsZero() { if opt.Page == 1 { return tt.pipelinesKeep, nil } return []*woodpecker.Pipeline{}, nil } - // Return pipelines to purge for calls with After filter - if !opt.After.IsZero() { + // Return pipelines to purge for calls with Before filter + if !opt.Before.IsZero() { if opt.Page == 1 { return tt.pipelines, nil } @@ -80,7 +99,9 @@ func TestPipelinePurge(t *testing.T) { return []*woodpecker.Pipeline{}, nil }).Maybe() - if tt.wantDelete > 0 { + if tt.mockDeleteError != nil { + mockClient.On("PipelineDelete", tt.repoID, mock.Anything).Return(tt.mockDeleteError) + } else if tt.wantDelete > 0 { mockClient.On("PipelineDelete", tt.repoID, mock.Anything).Return(nil).Times(tt.wantDelete) } diff --git a/cli/pipeline/queue.go b/cli/pipeline/queue.go index ffa123d4e..239179456 100644 --- a/cli/pipeline/queue.go +++ b/cli/pipeline/queue.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var pipelineQueueCmd = &cli.Command{ diff --git a/cli/pipeline/show.go b/cli/pipeline/show.go index 2f14224af..2b9a25d4a 100644 --- a/cli/pipeline/show.go +++ b/cli/pipeline/show.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var pipelineShowCmd = &cli.Command{ diff --git a/cli/pipeline/start.go b/cli/pipeline/start.go index 02c3e3de0..694295fae 100644 --- a/cli/pipeline/start.go +++ b/cli/pipeline/start.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var pipelineStartCmd = &cli.Command{ diff --git a/cli/pipeline/stop.go b/cli/pipeline/stop.go index a69352249..af2fa7b4d 100644 --- a/cli/pipeline/stop.go +++ b/cli/pipeline/stop.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var pipelineStopCmd = &cli.Command{ diff --git a/cli/repo/cron/cron_add.go b/cli/repo/cron/cron_add.go index 2ab730e0d..df86ef483 100644 --- a/cli/repo/cron/cron_add.go +++ b/cli/repo/cron/cron_add.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var cronCreateCmd = &cli.Command{ diff --git a/cli/repo/cron/cron_list.go b/cli/repo/cron/cron_list.go index 6925b784d..45b1d4fb4 100644 --- a/cli/repo/cron/cron_list.go +++ b/cli/repo/cron/cron_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var cronListCmd = &cli.Command{ diff --git a/cli/repo/cron/cron_rm.go b/cli/repo/cron/cron_rm.go index 048dcd605..89a6fcb7b 100644 --- a/cli/repo/cron/cron_rm.go +++ b/cli/repo/cron/cron_rm.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var cronDeleteCmd = &cli.Command{ diff --git a/cli/repo/cron/cron_show.go b/cli/repo/cron/cron_show.go index 2e8b86650..c2bc9c36b 100644 --- a/cli/repo/cron/cron_show.go +++ b/cli/repo/cron/cron_show.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var cronShowCmd = &cli.Command{ diff --git a/cli/repo/cron/cron_update.go b/cli/repo/cron/cron_update.go index de66e9a1f..987505b84 100644 --- a/cli/repo/cron/cron_update.go +++ b/cli/repo/cron/cron_update.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var cronUpdateCmd = &cli.Command{ diff --git a/cli/repo/registry/registry.go b/cli/repo/registry/registry.go index ab362934a..475d7564f 100644 --- a/cli/repo/registry/registry.go +++ b/cli/repo/registry/registry.go @@ -17,8 +17,8 @@ package registry import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the registry command set. diff --git a/cli/repo/registry/registry_add.go b/cli/repo/registry/registry_add.go index 50eecffa0..87202244b 100644 --- a/cli/repo/registry/registry_add.go +++ b/cli/repo/registry/registry_add.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryCreateCmd = &cli.Command{ diff --git a/cli/repo/registry/registry_list.go b/cli/repo/registry/registry_list.go index d76bcc18b..8d41457b3 100644 --- a/cli/repo/registry/registry_list.go +++ b/cli/repo/registry/registry_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryListCmd = &cli.Command{ diff --git a/cli/repo/registry/registry_rm.go b/cli/repo/registry/registry_rm.go index 4b3437d48..94613e8d0 100644 --- a/cli/repo/registry/registry_rm.go +++ b/cli/repo/registry/registry_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryDeleteCmd = &cli.Command{ diff --git a/cli/repo/registry/registry_set.go b/cli/repo/registry/registry_set.go index 4af39f5c2..131269f9c 100644 --- a/cli/repo/registry/registry_set.go +++ b/cli/repo/registry/registry_set.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryUpdateCmd = &cli.Command{ diff --git a/cli/repo/registry/registry_show.go b/cli/repo/registry/registry_show.go index d3b50b9f2..b3b7869a5 100644 --- a/cli/repo/registry/registry_show.go +++ b/cli/repo/registry/registry_show.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryShowCmd = &cli.Command{ diff --git a/cli/repo/repo.go b/cli/repo/repo.go index 8bb3b612a..f64f6a280 100644 --- a/cli/repo/repo.go +++ b/cli/repo/repo.go @@ -17,9 +17,9 @@ package repo import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/repo/cron" - "go.woodpecker-ci.org/woodpecker/v2/cli/repo/registry" - "go.woodpecker-ci.org/woodpecker/v2/cli/repo/secret" + "go.woodpecker-ci.org/woodpecker/v3/cli/repo/cron" + "go.woodpecker-ci.org/woodpecker/v3/cli/repo/registry" + "go.woodpecker-ci.org/woodpecker/v3/cli/repo/secret" ) // Command exports the repository command. diff --git a/cli/repo/repo_add.go b/cli/repo/repo_add.go index 55601dd85..c9cd60a73 100644 --- a/cli/repo/repo_add.go +++ b/cli/repo/repo_add.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var repoAddCmd = &cli.Command{ diff --git a/cli/repo/repo_chown.go b/cli/repo/repo_chown.go index 118940184..f294ab277 100644 --- a/cli/repo/repo_chown.go +++ b/cli/repo/repo_chown.go @@ -20,7 +20,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var repoChownCmd = &cli.Command{ diff --git a/cli/repo/repo_list.go b/cli/repo/repo_list.go index 4e2ae0f85..92e5b73d5 100644 --- a/cli/repo/repo_list.go +++ b/cli/repo/repo_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var repoListCmd = &cli.Command{ diff --git a/cli/repo/repo_repair.go b/cli/repo/repo_repair.go index 35ca8f398..850d97357 100644 --- a/cli/repo/repo_repair.go +++ b/cli/repo/repo_repair.go @@ -20,7 +20,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var repoRepairCmd = &cli.Command{ diff --git a/cli/repo/repo_rm.go b/cli/repo/repo_rm.go index b884dccf3..0b56c70e7 100644 --- a/cli/repo/repo_rm.go +++ b/cli/repo/repo_rm.go @@ -20,7 +20,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var repoRemoveCmd = &cli.Command{ diff --git a/cli/repo/repo_show.go b/cli/repo/repo_show.go index af8a45153..c9c9ce87c 100644 --- a/cli/repo/repo_show.go +++ b/cli/repo/repo_show.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var repoShowCmd = &cli.Command{ diff --git a/cli/repo/repo_sync.go b/cli/repo/repo_sync.go index b9bbdaa63..d7802c92e 100644 --- a/cli/repo/repo_sync.go +++ b/cli/repo/repo_sync.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var repoSyncCmd = &cli.Command{ diff --git a/cli/repo/repo_update.go b/cli/repo/repo_update.go index d8bc73917..dd28e3d28 100644 --- a/cli/repo/repo_update.go +++ b/cli/repo/repo_update.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var repoUpdateCmd = &cli.Command{ diff --git a/cli/repo/secret/secret.go b/cli/repo/secret/secret.go index 2d5d965e6..4bdbf674b 100644 --- a/cli/repo/secret/secret.go +++ b/cli/repo/secret/secret.go @@ -17,8 +17,8 @@ package secret import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the secret command. diff --git a/cli/repo/secret/secret_add.go b/cli/repo/secret/secret_add.go index cc4251e20..fb6e21383 100644 --- a/cli/repo/secret/secret_add.go +++ b/cli/repo/secret/secret_add.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretCreateCmd = &cli.Command{ diff --git a/cli/repo/secret/secret_list.go b/cli/repo/secret/secret_list.go index 3ad0b23d4..b6bf0145f 100644 --- a/cli/repo/secret/secret_list.go +++ b/cli/repo/secret/secret_list.go @@ -22,9 +22,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretListCmd = &cli.Command{ diff --git a/cli/repo/secret/secret_rm.go b/cli/repo/secret/secret_rm.go index aa0109e67..b2fb8c07b 100644 --- a/cli/repo/secret/secret_rm.go +++ b/cli/repo/secret/secret_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretDeleteCmd = &cli.Command{ diff --git a/cli/repo/secret/secret_set.go b/cli/repo/secret/secret_set.go index 60c0fcc8d..b28473527 100644 --- a/cli/repo/secret/secret_set.go +++ b/cli/repo/secret/secret_set.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretUpdateCmd = &cli.Command{ diff --git a/cli/repo/secret/secret_show.go b/cli/repo/secret/secret_show.go index 8387f4054..15515fdb8 100644 --- a/cli/repo/secret/secret_show.go +++ b/cli/repo/secret/secret_show.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretShowCmd = &cli.Command{ diff --git a/cli/setup/setup.go b/cli/setup/setup.go index c0be0006a..8b00467cf 100644 --- a/cli/setup/setup.go +++ b/cli/setup/setup.go @@ -8,8 +8,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal/config" - "go.woodpecker-ci.org/woodpecker/v2/cli/setup/ui" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal/config" + "go.woodpecker-ci.org/woodpecker/v3/cli/setup/ui" ) // Command exports the setup command. diff --git a/cli/update/updater.go b/cli/update/updater.go index d77bad6a4..2810989ee 100644 --- a/cli/update/updater.go +++ b/cli/update/updater.go @@ -14,7 +14,7 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/version" ) func CheckForUpdate(ctx context.Context, force bool) (*NewVersion, error) { diff --git a/cli/update/updater_test.go b/cli/update/updater_test.go index a2855ac8e..9de9001af 100644 --- a/cli/update/updater_test.go +++ b/cli/update/updater_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/version" ) func TestCheckForUpdate(t *testing.T) { diff --git a/cmd/agent/core/agent.go b/cmd/agent/core/agent.go index cba6249b1..a9f858300 100644 --- a/cmd/agent/core/agent.go +++ b/cmd/agent/core/agent.go @@ -38,14 +38,14 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "go.woodpecker-ci.org/woodpecker/v2/agent" - agent_rpc "go.woodpecker-ci.org/woodpecker/v2/agent/rpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/agent" + agent_rpc "go.woodpecker-ci.org/woodpecker/v3/agent/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/version" ) const ( diff --git a/cmd/agent/core/health.go b/cmd/agent/core/health.go index b9c6398b1..7997c570f 100644 --- a/cmd/agent/core/health.go +++ b/cmd/agent/core/health.go @@ -24,8 +24,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/agent" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/agent" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // The file implements some basic healthcheck logic based on the diff --git a/cmd/agent/core/health_test.go b/cmd/agent/core/health_test.go index 326d37536..30bea8cc9 100644 --- a/cmd/agent/core/health_test.go +++ b/cmd/agent/core/health_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/agent" + "go.woodpecker-ci.org/woodpecker/v3/agent" ) func TestHealthy(t *testing.T) { diff --git a/cmd/agent/core/run.go b/cmd/agent/core/run.go index 3b01c2dc7..f3175c5b4 100644 --- a/cmd/agent/core/run.go +++ b/cmd/agent/core/run.go @@ -23,10 +23,10 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" - "go.woodpecker-ci.org/woodpecker/v2/version" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/version" ) func RunAgent(ctx context.Context, backends []backend.Backend) { diff --git a/cmd/agent/dummy.go b/cmd/agent/dummy.go index 398b50f10..f2da7c105 100644 --- a/cmd/agent/dummy.go +++ b/cmd/agent/dummy.go @@ -17,7 +17,7 @@ package main -import "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/dummy" +import "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/dummy" func init() { //nolint:gochecknoinits backends = append(backends, dummy.New()) diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 37316195e..8b1854aec 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -19,12 +19,12 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/cmd/agent/core" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/docker" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/kubernetes" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/local" - backendTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/cmd/agent/core" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/docker" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/kubernetes" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/local" + backendTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) var backends = []backendTypes.Backend{ diff --git a/cmd/cli/app.go b/cmd/cli/app.go index 2784b08a3..301ec61f4 100644 --- a/cmd/cli/app.go +++ b/cmd/cli/app.go @@ -17,17 +17,17 @@ package main import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/admin" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/exec" - "go.woodpecker-ci.org/woodpecker/v2/cli/info" - "go.woodpecker-ci.org/woodpecker/v2/cli/lint" - "go.woodpecker-ci.org/woodpecker/v2/cli/org" - "go.woodpecker-ci.org/woodpecker/v2/cli/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/cli/repo" - "go.woodpecker-ci.org/woodpecker/v2/cli/setup" - "go.woodpecker-ci.org/woodpecker/v2/cli/update" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/cli/admin" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/exec" + "go.woodpecker-ci.org/woodpecker/v3/cli/info" + "go.woodpecker-ci.org/woodpecker/v3/cli/lint" + "go.woodpecker-ci.org/woodpecker/v3/cli/org" + "go.woodpecker-ci.org/woodpecker/v3/cli/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/cli/repo" + "go.woodpecker-ci.org/woodpecker/v3/cli/setup" + "go.woodpecker-ci.org/woodpecker/v3/cli/update" + "go.woodpecker-ci.org/woodpecker/v3/version" ) //go:generate go run docs.go app.go diff --git a/cmd/cli/main.go b/cmd/cli/main.go index eb0f309df..d6670dadc 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -21,7 +21,7 @@ import ( _ "github.com/joho/godotenv/autoload" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func main() { diff --git a/cmd/server/flags.go b/cmd/server/flags.go index 6dd19c1be..7e63e7f51 100644 --- a/cmd/server/flags.go +++ b/cmd/server/flags.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" ) var flags = append([]cli.Flag{ diff --git a/cmd/server/grpc_server.go b/cmd/server/grpc_server.go index f983bb158..7e7cf2a1a 100644 --- a/cmd/server/grpc_server.go +++ b/cmd/server/grpc_server.go @@ -24,10 +24,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" - "go.woodpecker-ci.org/woodpecker/v2/server" - woodpeckerGrpcServer "go.woodpecker-ci.org/woodpecker/v2/server/grpc" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v3/server" + woodpeckerGrpcServer "go.woodpecker-ci.org/woodpecker/v3/server/grpc" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func runGrpcServer(ctx context.Context, c *cli.Command, _store store.Store) error { diff --git a/cmd/server/main.go b/cmd/server/main.go index 009e14b9d..5ac49ff27 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -25,9 +25,9 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - _ "go.woodpecker-ci.org/woodpecker/v2/cmd/server/openapi" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" - "go.woodpecker-ci.org/woodpecker/v2/version" + _ "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/version" ) func main() { diff --git a/cmd/server/metrics_server.go b/cmd/server/metrics_server.go index 007d2e48d..078099b3b 100644 --- a/cmd/server/metrics_server.go +++ b/cmd/server/metrics_server.go @@ -23,8 +23,8 @@ import ( prometheus_auto "github.com/prometheus/client_golang/prometheus/promauto" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func startMetricsCollector(ctx context.Context, _store store.Store) { diff --git a/cmd/server/openapi.go b/cmd/server/openapi.go index 37b68179a..ad4d97e12 100644 --- a/cmd/server/openapi.go +++ b/cmd/server/openapi.go @@ -15,8 +15,8 @@ package main import ( - "go.woodpecker-ci.org/woodpecker/v2/cmd/server/openapi" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // Generate docs/openapi.json via: diff --git a/cmd/server/openapi/docs.go b/cmd/server/openapi/docs.go index 8b7c33c60..5452b9747 100644 --- a/cmd/server/openapi/docs.go +++ b/cmd/server/openapi/docs.go @@ -5115,9 +5115,6 @@ const docTemplate = `{ "require_approval": { "$ref": "#/definitions/model.ApprovalMode" }, - "scm": { - "$ref": "#/definitions/SCMKind" - }, "timeout": { "type": "integer" }, @@ -5184,21 +5181,6 @@ const docTemplate = `{ "VisibilityInternal" ] }, - "SCMKind": { - "type": "string", - "enum": [ - "git", - "hg", - "fossil", - "perforce" - ], - "x-enum-varnames": [ - "RepoGit", - "RepoHg", - "RepoFossil", - "RepoPerforce" - ] - }, "Secret": { "type": "object", "properties": { @@ -5581,9 +5563,6 @@ const docTemplate = `{ "remote_id": { "type": "string" }, - "scm": { - "type": "string" - }, "trusted": { "$ref": "#/definitions/metadata.TrustedConfiguration" } diff --git a/cmd/server/openapi_json_gen.go b/cmd/server/openapi_json_gen.go index cccbd3e30..73474b8e3 100644 --- a/cmd/server/openapi_json_gen.go +++ b/cmd/server/openapi_json_gen.go @@ -31,7 +31,7 @@ import ( "github.com/getkin/kin-openapi/openapi2" "github.com/getkin/kin-openapi/openapi2conv" - "go.woodpecker-ci.org/woodpecker/v2/cmd/server/openapi" + "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" ) func main() { diff --git a/cmd/server/openapi_test.go b/cmd/server/openapi_test.go index 95773ce00..448aa1fad 100644 --- a/cmd/server/openapi_test.go +++ b/cmd/server/openapi_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/cmd/server/openapi" + "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" ) func TestSetupOpenApiStaticConfig(t *testing.T) { diff --git a/cmd/server/server.go b/cmd/server/server.go index 2983947d2..420f0c500 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -32,13 +32,13 @@ import ( "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/cron" - "go.woodpecker-ci.org/woodpecker/v2/server/router" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware" - "go.woodpecker-ci.org/woodpecker/v2/server/web" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/cron" + "go.woodpecker-ci.org/woodpecker/v3/server/router" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware" + "go.woodpecker-ci.org/woodpecker/v3/server/web" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/version" ) const ( diff --git a/cmd/server/setup.go b/cmd/server/setup.go index d682e31cf..b36c83dbd 100644 --- a/cmd/server/setup.go +++ b/cmd/server/setup.go @@ -29,20 +29,20 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/cache" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/setup" - "go.woodpecker-ci.org/woodpecker/v2/server/logging" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - "go.woodpecker-ci.org/woodpecker/v2/server/services" - logService "go.woodpecker-ci.org/woodpecker/v2/server/services/log" - "go.woodpecker-ci.org/woodpecker/v2/server/services/log/file" - "go.woodpecker-ci.org/woodpecker/v2/server/services/permissions" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/datastore" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/cache" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/setup" + "go.woodpecker-ci.org/woodpecker/v3/server/logging" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/server/services" + logService "go.woodpecker-ci.org/woodpecker/v3/server/services/log" + "go.woodpecker-ci.org/woodpecker/v3/server/services/log/file" + "go.woodpecker-ci.org/woodpecker/v3/server/services/permissions" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/datastore" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) const ( @@ -84,7 +84,7 @@ func setupStore(ctx context.Context, c *cli.Command) (store.Store, error) { Config: datasource, XORM: xorm, } - log.Trace().Msgf("setup datastore: %#v", *opts) + log.Debug().Str("driver", driver).Any("xorm", xorm).Msg("setting up datastore") store, err := datastore.NewEngine(opts) if err != nil { return nil, fmt.Errorf("could not open datastore: %w", err) diff --git a/docker-compose.example.yaml b/docker-compose.example.yaml index 6ce862d79..f54121f7f 100644 --- a/docker-compose.example.yaml +++ b/docker-compose.example.yaml @@ -2,7 +2,7 @@ version: '3' services: woodpecker-server: - image: woodpeckerci/woodpecker-server:latest + image: woodpeckerci/woodpecker-server:v3 ports: - 8000:8000 networks: @@ -21,7 +21,7 @@ services: depends_on: woodpecker-server: condition: service_healthy - image: woodpeckerci/woodpecker-agent:latest + image: woodpeckerci/woodpecker-agent:v3 networks: - woodpecker volumes: diff --git a/docker/Dockerfile.make b/docker/Dockerfile.make index 8bedc7dae..44718613a 100644 --- a/docker/Dockerfile.make +++ b/docker/Dockerfile.make @@ -1,5 +1,5 @@ -# docker build --rm -f docker/Dockerfile.make -t woodpecker/make:local . -FROM docker.io/golang:1.23-alpine as golang_image +# docker build --rm -f docker/Dockerfile.make -t woodpecker/make:local . +FROM docker.io/golang:1.23-alpine AS golang_image FROM docker.io/node:23-alpine RUN apk add --no-cache --update make gcc binutils-gold musl-dev protoc && \ @@ -10,6 +10,7 @@ COPY --from=golang_image /usr/local/go /usr/local/go COPY Makefile / ENV PATH=$PATH:/usr/local/go/bin ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0 +ENV COREPACK_ENABLE_AUTO_PIN=0 # Cache tools RUN GOBIN=/usr/local/go/bin make install-tools && \ diff --git a/docs/docs/20-usage/20-workflow-syntax.md b/docs/docs/20-usage/20-workflow-syntax.md index 4ba0ffd92..970ae3eff 100644 --- a/docs/docs/20-usage/20-workflow-syntax.md +++ b/docs/docs/20-usage/20-workflow-syntax.md @@ -686,16 +686,6 @@ Example configuration to use a custom clone plugin: + image: octocat/custom-git-plugin ``` -Example configuration to clone Mercurial repository: - -```diff - clone: - - name: hg -+ image: plugins/hg -+ settings: -+ path: bitbucket.org/foo/bar -``` - ### Git Submodules To use the credentials that cloned the repository to clone it's submodules, update `.gitmodules` to use `https` instead of `git`: @@ -799,8 +789,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 diff --git a/docs/docs/20-usage/40-secrets.md b/docs/docs/20-usage/40-secrets.md index 2c7065815..de120300c 100644 --- a/docs/docs/20-usage/40-secrets.md +++ b/docs/docs/20-usage/40-secrets.md @@ -11,17 +11,27 @@ Woodpecker provides three different levels to add secrets to your pipeline. The ## Usage -You can set a setting or an environment value from secrets using the `from_secret` syntax. +You can set a setting or environment value from secrets using the `from_secret` syntax. -In this example, the secret named `secret_token` would be passed to the setting named `token`,which will be available in the plugin as environment variable named `PLUGIN_TOKEN` (See [plugins](./51-plugins/20-creating-plugins.md#settings) for details), and to the environment variable `TOKEN_ENV`. +The example below passes a secret called `secret_token` as an environment variable that will be called `TOKEN_ENV`: ```diff steps: - - name: docker - image: my-plugin + env-secret-example: + image: alpine + commands: ++ - echo "The secret is $TOKEN_ENV" + environment: + TOKEN_ENV: + from_secret: secret_token +``` + +You can use the same syntax to pass secrets to settings. For example, you can pass a secret named `secret_token` to the settings called `token`, which will then be available in the plugin as environment variable named `PLUGIN_TOKEN` (See [plugins](./51-plugins/20-creating-plugins.md#settings) for details). + +```diff + steps: + - name: settings-secret-example + image: my-plugin + settings: + token: + from_secret: secret_token diff --git a/docs/docs/20-usage/50-environment.md b/docs/docs/20-usage/50-environment.md index 2e056ecc6..746cb7634 100644 --- a/docs/docs/20-usage/50-environment.md +++ b/docs/docs/20-usage/50-environment.md @@ -56,7 +56,6 @@ This is the reference list of all environment variables available to your pipeli | `CI_REPO_OWNER` | repository owner | `john-doe` | | `CI_REPO_NAME` | repository name | `my-repo` | | `CI_REPO_REMOTE_ID` | repository remote ID, is the UID it has in the forge | `82` | -| `CI_REPO_SCM` | repository SCM | `git` | | `CI_REPO_URL` | repository web URL | `https://git.example.com/john-doe/my-repo` | | `CI_REPO_CLONE_URL` | repository clone URL | `https://git.example.com/john-doe/my-repo.git` | | `CI_REPO_CLONE_SSH_URL` | repository SSH clone URL | `git@git.example.com:john-doe/my-repo.git` | diff --git a/docs/docs/20-usage/75-project-settings.md b/docs/docs/20-usage/75-project-settings.md index b87b3011d..d4495c41b 100644 --- a/docs/docs/20-usage/75-project-settings.md +++ b/docs/docs/20-usage/75-project-settings.md @@ -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 diff --git a/docs/docs/20-usage/90-advanced-usage.md b/docs/docs/20-usage/90-advanced-usage.md index 910646629..e8a691de0 100644 --- a/docs/docs/20-usage/90-advanced-usage.md +++ b/docs/docs/20-usage/90-advanced-usage.md @@ -127,3 +127,96 @@ WOODPECKER_ENVIRONMENT=first_var:value1,second_var:value2 ``` Note that this tightly couples the server and app configurations (where the app is a completely separate application). But this is a good option for truly global variables which should apply to all steps in all pipelines for all apps. + +## Docker in docker (dind) setup + +:::warning +This set up will only work on trusted repositories and for security reasons should only be used in private environments. +See [project settings](./75-project-settings.md#trusted) to enable "trusted" mode. +::: + +The snippet below shows how a step can communicate with the docker daemon running in a `docker:dind` service. + +:::note +If your goal is to build/publish OCI images, consider using the [Docker Buildx Plugin](https://woodpecker-ci.org/plugins/Docker%20Buildx) instead. +::: + +First we need to define a service running a docker with the `dind` tag. +This service must run in `privileged` mode: + +```yaml +services: + - name: docker + image: docker:dind # use 'docker:-dind' or similar in production + privileged: true + ports: + - 2376 +``` + +Next, we need to set up TLS communication between the `dind` service and the step that wants to communicate with the docker daemon (unauthenticated TCP connections have been deprecated [as of docker v27](https://github.com/docker/cli/blob/v27.4.0/docs/deprecated.md#unauthenticated-tcp-connections) and will result in an error in v28). + +This can be achieved by letting the daemon generate TLS certificates and share them with the client through an agent volume mount (`/opt/woodpeckerci/dind-certs` in the example below). + +```diff +services: + - name: docker + image: docker:dind # use 'docker:-dind' or similar in production + privileged: true ++ environment: ++ DOCKER_TLS_CERTDIR: /dind-certs ++ volumes: ++ - /opt/woodpeckerci/dind-certs:/dind-certs + ports: + - 2376 +``` + +In the docker client step: + +1. Set the `DOCKER_*` environment variables shown below to configure the connection with the daemon. + These generic docker environment variables that are framework-agnostic (e.g. frameworks like [TestContainers](https://testcontainers.com/), [Spring Boot Docker Compose](https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-docker-compose) do all respect them). +2. Mount the volume to the location where the daemon has created the certificates (`/opt/woodpeckerci/dind-certs`) + +Test the connection with the docker client: + +```diff +steps: + - name: test + image: docker:cli # in production use something like 'docker:-cli' ++ environment: ++ DOCKER_HOST: "tcp://docker:2376" ++ DOCKER_CERT_PATH: "/dind-certs/client" ++ DOCKER_TLS_VERIFY: "1" ++ volumes: ++ - /opt/woodpeckerci/dind-certs:/dind-certs + commands: + - docker version +``` + +This step should output the server and client version information if everything has been set up correctly. + +Full example: + +```yaml +steps: + - name: test + image: docker:cli # use 'docker:-cli' or similar in production + environment: + DOCKER_HOST: 'tcp://docker:2376' + DOCKER_CERT_PATH: '/dind-certs/client' + DOCKER_TLS_VERIFY: '1' + volumes: + - /opt/woodpeckerci/dind-certs:/dind-certs + commands: + - docker version + +services: + - name: docker + image: docker:dind # use 'docker:-dind' or similar in production + privileged: true + environment: + DOCKER_TLS_CERTDIR: /dind-certs + volumes: + - /opt/woodpeckerci/dind-certs:/dind-certs + ports: + - 2376 +``` diff --git a/docs/docs/30-administration/05-deployment-methods/10-docker-compose.md b/docs/docs/30-administration/05-deployment-methods/10-docker-compose.md index a00353d3a..a9d59c9d7 100644 --- a/docs/docs/30-administration/05-deployment-methods/10-docker-compose.md +++ b/docs/docs/30-administration/05-deployment-methods/10-docker-compose.md @@ -115,21 +115,26 @@ The server and agents use a shared secret to authenticate communication. This sh Image variants: -- The `latest` image is the latest stable release - The `vX.X.X` images are stable releases -- The `vX.X` images are based on the current release branch (e.g. `release/v1.0`) and can be used to get bugfixes asap +- The `vX.X` images are based on the current release branch (e.g. `release/v1.0`) and can be used to get bug fixes asap +- The `vX` same as `vX.X` variant but also includes feature releases - The `next` images are based on the current `main` branch +:::note +The `latest` tag is not available on purpose (and has been dropped with the 3.x release) to prevent accidental major version upgrades. +Hence, users are forced to specify a fixed or rolling tag, omitting the tag identifier (which equals to pulling `latest` implicitly) won't work. +::: + ```bash # server -docker pull woodpeckerci/woodpecker-server:latest -docker pull woodpeckerci/woodpecker-server:latest-alpine +docker pull woodpeckerci/woodpecker-server:v3 +docker pull woodpeckerci/woodpecker-server:v3-alpine # agent -docker pull woodpeckerci/woodpecker-agent:latest -docker pull woodpeckerci/woodpecker-agent:latest-alpine +docker pull woodpeckerci/woodpecker-agent:v3 +docker pull woodpeckerci/woodpecker-agent:v3-alpine # cli -docker pull woodpeckerci/woodpecker-cli:latest -docker pull woodpeckerci/woodpecker-cli:latest-alpine +docker pull woodpeckerci/woodpecker-cli:v3 +docker pull woodpeckerci/woodpecker-cli:v3-alpine ``` diff --git a/docs/docs/30-administration/11-forges/100-addon.md b/docs/docs/30-administration/11-forges/100-addon.md index fca20ac95..b1bd6ca9f 100644 --- a/docs/docs/30-administration/11-forges/100-addon.md +++ b/docs/docs/30-administration/11-forges/100-addon.md @@ -38,9 +38,9 @@ Addons use RPC to communicate to the server and are implemented using the [`go-p This example will use the Go language. -Directly import Woodpecker's Go packages (`go.woodpecker-ci.org/woodpecker/v2`) and use the interfaces and types defined there. +Directly import Woodpecker's Go packages (`go.woodpecker-ci.org/woodpecker/v3`) and use the interfaces and types defined there. -In the `main` function, just call `"go.woodpecker-ci.org/woodpecker/v2/server/forge/addon".Serve` with a `"go.woodpecker-ci.org/woodpecker/v2/server/forge".Forge` as argument. +In the `main` function, just call `"go.woodpecker-ci.org/woodpecker/v3/server/forge/addon".Serve` with a `"go.woodpecker-ci.org/woodpecker/v3/server/forge".Forge` as argument. This will take care of connecting the addon forge to the server. ### Example structure @@ -52,9 +52,9 @@ import ( "context" "net/http" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/addon" - forgeTypes "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/addon" + forgeTypes "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func main() { @@ -64,5 +64,5 @@ func main() { type config struct { } -// `config` must implement `"go.woodpecker-ci.org/woodpecker/v2/server/forge".Forge`. You must directly use Woodpecker's packages - see imports above. +// `config` must implement `"go.woodpecker-ci.org/woodpecker/v3/server/forge".Forge`. You must directly use Woodpecker's packages - see imports above. ``` diff --git a/docs/docs/30-administration/22-backends/50-custom-backends.md b/docs/docs/30-administration/22-backends/50-custom-backends.md index a35a4f1ee..c95956559 100644 --- a/docs/docs/30-administration/22-backends/50-custom-backends.md +++ b/docs/docs/30-administration/22-backends/50-custom-backends.md @@ -9,8 +9,8 @@ build a custom agent using your backend with this `main.go`: package main import ( - "go.woodpecker-ci.org/woodpecker/v2/cmd/agent/core" - backendTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/cmd/agent/core" + backendTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func main() { diff --git a/docs/docs/50-about.md b/docs/docs/50-about.md index bec3304a1..fe7b4a55f 100644 --- a/docs/docs/50-about.md +++ b/docs/docs/50-about.md @@ -1,10 +1,10 @@ # About -Woodpecker has been originally forked from Drone 0.8 as the Drone CI license was changed after the 0.8 release from Apache 2.0 to a proprietary license. Woodpecker is based on this latest freely available version. +Woodpecker is a community-driven open source CI/CD tool. It is lightweight, fast and simple to use. It can be used with many different Git providers and runners. ## History -Woodpecker was originally forked by [@laszlocph](https://github.com/laszlocph) in 2019. +Woodpecker was originally forked from Drone 0.8 by [@laszlocph](https://github.com/laszlocph) in 2019 after its license model was changed. A few important time points: @@ -15,4 +15,5 @@ A few important time points: ## Differences to Drone -Woodpecker is a community-focused software that still stay free and open source forever, while Drone is managed by [Harness](https://harness.io/) and published under [Polyform Small Business](https://polyformproject.org/licenses/small-business/1.0.0/) license. +Woodpecker is a community-driven open source software published under the Apache License 2.0 and will always remain so. Drone CI is managed by [Harness](https://harness.io/) and is available in two editions: [Open Source under Apache License 2.0 and Enterprise under Polyform Small Business license](https://docs.drone.io/enterprise/#is-drone-open-source). +In terms of Drone's feature set, Woodpecker is somewhere between [Drone Enterprise and OSS](https://docs.drone.io/enterprise/#what-is-the-difference-between-open-source-and-enterprise), but also has some unique features. diff --git a/docs/docs/92-development/01-getting-started.md b/docs/docs/92-development/01-getting-started.md index 2c93526ad..bff7e7fe1 100644 --- a/docs/docs/92-development/01-getting-started.md +++ b/docs/docs/92-development/01-getting-started.md @@ -128,7 +128,7 @@ make test-frontend If you want to test a specific Go file, you can also use: ```bash -go test -race -timeout 30s go.woodpecker-ci.org/woodpecker/v2/ +go test -race -timeout 30s go.woodpecker-ci.org/woodpecker/v3/ ``` Or you can open the test-file inside [VS-Code](#developing-with-vs-code) and run or debug the test by clicking on the inline commands: diff --git a/docs/plugins/woodpecker-plugins/src/theme/WoodpeckerPluginList.tsx b/docs/plugins/woodpecker-plugins/src/theme/WoodpeckerPluginList.tsx index 3fd3e37b3..d998660a1 100644 --- a/docs/plugins/woodpecker-plugins/src/theme/WoodpeckerPluginList.tsx +++ b/docs/plugins/woodpecker-plugins/src/theme/WoodpeckerPluginList.tsx @@ -41,7 +41,7 @@ export function WoodpeckerPluginList({ plugins }: { plugins: WoodpeckerPlugin[] const fuse = useRef( new Fuse(plugins, { - keys: ['name', 'description'], + keys: ['name', 'description', 'tags'], threshold: 0.3, }), ); diff --git a/docs/src/pages/migrations.md b/docs/src/pages/migrations.md index 6efe74623..bd8be044c 100644 --- a/docs/src/pages/migrations.md +++ b/docs/src/pages/migrations.md @@ -1,12 +1,176 @@ # Migrations -Some versions need some changes to the server configuration or the pipeline configuration files. If you are an user check the `User migrations` section of an version. As an admin of a Woodpecker server or agent check the `Admin migrations` section. - ## `next` -:::info -This will be the next version of Woodpecker. -::: +- No changes + +## 3.0.0 + +### User-facing migrations + +#### Security + +- The "gated" option, which restricted which pipelines can start right away without requiring approval, has been replaced by "require-approval" option. Even though this feature ([#3348](https://github.com/woodpecker-ci/woodpecker/pull/3348)) was backported to 2.8, no default is explicitly set. + The new default in 3.0 is to require approval only for forked repositories. + This allows easier management of dependency bots and other trusted entities having write access to the repository. + +#### Environment variables + +- Environment variables must now be defined as maps. List definitions are disallowed. ([#4016](https://github.com/woodpecker-ci/woodpecker/pull/4016)) + + 2.x: + + ```yaml + environment: + - ENV1=value1 + ``` + + 3.x: + + ```yaml + environment: + ENV1: value1 + ``` + +The following built-in environment variables have been removed/replaced: + +- `CI_COMMIT_URL` has been deprecated in favor of `CI_PIPELINE_FORGE_URL` +- `CI_STEP_FINISHED` as it was empty during execution +- `CI_PIPELINE_FINISHED` as it was empty during execution +- `CI_PIPELINE_STATUS` due to always being set to `success` +- `CI_STEP_STATUS` due to always being set to `success` +- `WOODPECKER_WEBHOOK_HOST` in favor of `WOODPECKER_EXPERT_WEBHOOK_HOST` + +Environment variables which are empty after workflow parsing are not being injected into the build but filtered out beforehand ([#4193](https://github.com/woodpecker-ci/woodpecker/pull/4193)) + +#### Former deprecations + +The following syntax deprecations will now result in an error: + +- `pipeline:` ([#3916](https://github.com/woodpecker-ci/woodpecker/pull/3916)) +- `platform:` ([#3916](https://github.com/woodpecker-ci/woodpecker/pull/3916)) +- `branches:` ([#3916](https://github.com/woodpecker-ci/woodpecker/pull/3916)) + +#### Workflow syntax changes + +- Grouping of steps via `steps.[name].group` should now be done using `steps.[name].depends_on` +- The `includes` and `excludes` event filter options have been removed +- Previously, env vars have been automatically sanitized to uppercase. + As this has been confusing, the type-case of the secret definition is now respected ([#3375](https://github.com/woodpecker-ci/woodpecker/pull/3375)). +- `secrets` have been entirely removed in favor of `environment` combined with the `from_secret` syntax. + As `secrets` are just normal env vars which are masked, the goal was to allow them to be declared next to normal env vars and at the same time reduce the keyword syntax count. + Additionally, the `from_secret` syntax gives more flexibility in naming. + Whereas beforehand `secrets` where always named after their initial secret name, the `from_secret` reference can now be different. + Last, one can inject multiple different env vars from the same secret reference. + + 2.x: + + ```yaml + secrets: [my_token] + ``` + + 3.x: + + ```yaml + environment: + MY_TOKEN: + from_secret: my_token + ``` + +- The `environment` filter option has been removed in favor of `when.evaluate` + +#### API changes + +- Removed deprecated `registry/` endpoint. Use `registries`, `/authorize/token` + +#### CLI changes + +The following restructuring was done to achieve a more consistent grouping: + +| Old Command | New Command | +| ------------------------------------------- | ------------------------------------------- | +| `woodpecker-cli registry` | `woodpecker-cli repo registry` | +| `woodpecker-cli secret --global` | `woodpecker-cli admin secret` | +| `woodpecker-cli user` | `woodpecker-cli admin user` | +| `woodpecker-cli log-level` | `woodpecker-cli admin log-level` | +| `woodpecker-cli secret --organization` | `woodpecker-cli org secret` | +| `woodpecker-cli deploy` | `woodpecker-cli pipeline deploy` | +| `woodpecker-cli log` | `woodpecker-cli pipeline log` | +| `woodpecker-cli cron` | `woodpecker-cli repo cron` | +| `woodpecker-cli secret --repository` | `woodpecker-cli repo secret` | +| `woodpecker-cli pipeline logs` | `woodpecker-cli pipeline log show` | +| `woodpecker-cli (registry,secret,...) info` | `woodpecker-cli (registry,secret,...) show` | + +#### Miscellaneous + +- For `woodpecker-cli` containers, `/woodpecker` has been set as the default `workdir` + +- Plugin filters for secrets (in the "secrets" repo settings) can now validate against tags. + Additionally, the description has been updated to reflect that these filters only apply to plugins ([#4069](https://github.com/woodpecker-ci/woodpecker/pull/4069)). + +- SDK changes: + + - The SDK fields `start_time`, `end_time`, `created_at`, `started_at`, `finished_at` and `reviewed_at` have been renamed to `started`, `finished`, `created`, `started`, `finished`, `reviewed` ([#3968](https://github.com/woodpecker-ci/woodpecker/pull/3968)) + - The `trusted` field of the repo model was changed from `boolean` to `object` + +- CRON definitions now use standard Linux syntax without seconds. + All custom CRON definitions which do not use keywords such as `@daily` or `@weekly` must be updated. + + Example definition for a CRON job running at 8 am daily: + + 2.x: + + ```sh + 0 0 8 * * * + ``` + + 3.x: + + ```sh + 0 8 * * * + ``` + +- Native Let's Encrypt certificate support has been dropped as it was almost unused and causing frequent issues. + Let's Encrypt needs to be set up standalone now. The SSL key pair can still be used in `WOODPECKER_SERVER_CERT` and `WOODPECKER_SERVER_KEY` as an alternative to using a reverse proxy for TLS termination. + +### Admin-facing migrations + +#### Image tags + +- The `latest` tag has been dropped to avoid accidental major version upgrades. + A dedicated semver tag specification must be used, i.e., either a fixed version (like `v3.0.0`) or a rolling tag (e.g. `v3.0` or `v3`). + +- Git is now the only officially supported SCM. + No others were supported previously, but the existence of the env var `CI_REPO_SCM` indicated that others might be. + The env var has now been removed including unused code associated with it. + +- Previously, some (official) plugins were granted the `privileged` option by default to allow simplified usage. + To streamline this process and enhance security transparency, no plugin is granted the `privileged` options by default anymore. + To allow the use of these plugins in >= 3.0, they must be set explicitly through `WOODPECKER_PLUGINS_PRIVILEGED` on the admin side. + This change mainly impacts the use of the `woodpeckerci/plugin-docker-buildx` plugin, which now will not work anymore unless explicitly listed through this env var ([#4053](https://github.com/woodpecker-ci/woodpecker/pull/4053)) + +- Environment variable deprecations: + + | Deprecated Variable | New Variable | + | -------------------------------- | ------------------------------------ | + | `WOODPECKER_LOG_XORM` | `WOODPECKER_DATABASE_LOG` | + | `WOODPECKER_LOG_XORM_SQL` | `WOODPECKER_DATABASE_LOG_SQL` | + | `WOODPECKER_FILTER_LABELS` | `WOODPECKER_AGENT_LABELS` | + | `WOODPECKER_ESCALATE` | `WOODPECKER_PLUGINS_PRIVILEGED` | + | `WOODPECKER_DEFAULT_CLONE_IMAGE` | `WOODPECKER_DEFAULT_CLONE_PLUGIN` | + | `WOODPECKER_DEV_OAUTH_HOST` | `WOODPECKER_EXPERT_FORGE_OAUTH_HOST` | + | `WOODPECKER_DEV_GITEA_OAUTH_URL` | `WOODPECKER_EXPERT_FORGE_OAUTH_HOST` | + | `WOODPECKER_ROOT_PATH` | `WOODPECKER_HOST` | + | `WOODPECKER_ROOT_URL` | `WOODPECKER_HOST` | + +- The resource limit settings for the "docker" backend were moved from the server into agent configuration. + This allows setting limits on an agent-level which allows greater resource definition granularity ([#3174](https://github.com/woodpecker-ci/woodpecker/pull/3174)) + +- "Kubernetes" backend: previously the image pull secret name was hard-coded to `regcred`. + To allow more flexibility and specifying multiple pull secrets, the default has been removed. + Image pull secrets must now be set explicitly via env var `WOODPECKER_BACKEND_K8S_PULL_SECRET_NAMES` ([#4005](https://github.com/woodpecker-ci/woodpecker/pull/4005)) + +- Webhook signatures now use the `rfc9421` protocol ## User migrations @@ -17,6 +181,7 @@ This will be the next version of Woodpecker. - `CI_PIPELINE_FINISHED` as empty during execution - `CI_PIPELINE_STATUS` was always `success` - `CI_STEP_STATUS` was always `success` + - `CI_REPO_SCM` was always `git` - Set `/woodpecker` as default workdir for the **woodpecker-cli** container - Secret filters for plugins now check against tag if specified - Compatibility mode of deprecated `pipeline:`, `platform:` and `branches:` pipeline config options are now removed and pipeline will now fail if still in use. @@ -46,7 +211,6 @@ This will be the next version of Woodpecker. - `woodpecker-cli secret [add|rm|...] --repository` is now `woodpecker-cli repo secret [add|rm|...]` - `woodpecker-cli pipeline logs` is now `woodpecker-cli pipeline log show` - `woodpecker-cli [registry|secret|...] info` is now `woodpecker-cli [registry|secret|...] show` -- Dropped native Let's Encrypt certificate support. You can either generate Let's Encrypt certificates externally and use `WOODPECKER_SERVER_CERT` and `WOODPECKER_SERVER_KEY` or use Woodpecker behind a reverse proxy like Caddy. ## Admin migrations @@ -63,7 +227,8 @@ This will be the next version of Woodpecker. - Removed slice definition for env vars - Migrated to rfc9421 for webhook signatures - Replaced `configs` object by `netrc` in external configuration APIs -- Disallow upgrades from 1.x, upgrade to 2.x first + +- Upgrading from 1.x versions to 3.x is disallowed, upgrading to 2.x first is required to ensure proper DB migrations ## 2.7.2 diff --git a/docs/static/img/feat-docker.svg b/docs/static/img/feat-docker.svg index 1498e22c8..31c054cf9 100644 --- a/docs/static/img/feat-docker.svg +++ b/docs/static/img/feat-docker.svg @@ -1,2 +1,2 @@ - + diff --git a/docs/static/img/feat-opensource.svg b/docs/static/img/feat-opensource.svg index 89366e23d..61f3b413b 100644 --- a/docs/static/img/feat-opensource.svg +++ b/docs/static/img/feat-opensource.svg @@ -1,2 +1,2 @@ - + diff --git a/docs/static/img/workflows.svg b/docs/static/img/workflows.svg index 966b99cc5..597fbb476 100644 --- a/docs/static/img/workflows.svg +++ b/docs/static/img/workflows.svg @@ -1,2 +1,2 @@ - + diff --git a/docs/versioned_docs/version-2.8/10-intro/index.md b/docs/versioned_docs/version-2.8/10-intro/index.md index 1d41cf6a4..7d9ced179 100644 --- a/docs/versioned_docs/version-2.8/10-intro/index.md +++ b/docs/versioned_docs/version-2.8/10-intro/index.md @@ -17,7 +17,7 @@ checks, tests and routines along the way. A typical pipeline might include the f If you are already using containers in your daily workflow, you'll for sure love Woodpecker. If not yet, you'll be amazed how easy it is to get started with [containers](https://opencontainers.org/). -## Already have access to a Woodpecker instace? +## Already have access to a Woodpecker instance? Then you might want to jump directly into it and [start creating your first pipelines](../20-usage/10-intro.md). diff --git a/docs/versioned_docs/version-2.8/20-usage/20-workflow-syntax.md b/docs/versioned_docs/version-2.8/20-usage/20-workflow-syntax.md index 3aac2176a..876812e3c 100644 --- a/docs/versioned_docs/version-2.8/20-usage/20-workflow-syntax.md +++ b/docs/versioned_docs/version-2.8/20-usage/20-workflow-syntax.md @@ -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 diff --git a/docs/versioned_docs/version-2.8/20-usage/40-secrets.md b/docs/versioned_docs/version-2.8/20-usage/40-secrets.md index 1b55d9ce1..2666ea86f 100644 --- a/docs/versioned_docs/version-2.8/20-usage/40-secrets.md +++ b/docs/versioned_docs/version-2.8/20-usage/40-secrets.md @@ -13,6 +13,12 @@ Woodpecker provides three different levels to add secrets to your pipeline. The ### Use secrets in commands +:::warning +The use of secrets is deprecated as of version 2.8 and planned to be removed with version 3. +Instead, you can use the *secrets in settings and environment* approach outlined below. +You can already migrate to this strategy with version 2.8. +::: + Secrets are exposed to your pipeline steps and plugins as uppercase environment variables and can therefore be referenced in the commands section of your pipeline, once their usage is declared in the `secrets` section: @@ -30,17 +36,27 @@ The case of the environment variables is not changed, but secret matching is don ### Use secrets in settings and environment -You can set an setting or environment value from secrets using the `from_secret` syntax. +You can set a setting or environment value from secrets using the `from_secret` syntax. -In this example, the secret named `secret_token` would be passed to the setting named `token`,which will be available in the plugin as environment variable named `PLUGIN_TOKEN` (See [plugins](./51-plugins/20-creating-plugins.md#settings) for details), and to the environment variable `TOKEN_ENV`. +The example below passes a secret called `secret_token` as an environment variable that will be called `TOKEN_ENV`: ```diff steps: - - name: docker - image: my-plugin + env-secret-example: + image: alpine + commands: ++ - echo "The secret is $TOKEN_ENV" + environment: + TOKEN_ENV: + from_secret: secret_token +``` + +You can use the same syntax to pass secrets to settings. For example, you can pass a secret named `secret_token` to the settings called `token`, which will then be available in the plugin as environment variable named `PLUGIN_TOKEN` (See [plugins](./51-plugins/20-creating-plugins.md#settings) for details). + +```diff + steps: + - name: settings-secret-example + image: my-plugin + settings: + token: + from_secret: secret_token diff --git a/docs/versioned_docs/version-2.8/20-usage/90-advanced-usage.md b/docs/versioned_docs/version-2.8/20-usage/90-advanced-usage.md index 065386fdf..c44c2baeb 100644 --- a/docs/versioned_docs/version-2.8/20-usage/90-advanced-usage.md +++ b/docs/versioned_docs/version-2.8/20-usage/90-advanced-usage.md @@ -127,3 +127,93 @@ WOODPECKER_ENVIRONMENT=first_var:value1,second_var:value2 ``` Note that this tightly couples the server and app configurations (where the app is a completely separate application). But this is a good option for truly global variables which should apply to all steps in all pipelines for all apps. + +## Docker in docker (dind) setup + +:::warning +This set up will only work on trusted repositories and for security reasons should only be used in private environments. +See [project settings](./75-project-settings.md#trusted) to enable trusted mode. +::: + +The snippet below shows how a step can communicate with the docker daemon via a `docker:dind` service. + +:::note +If your aim ist to build/publish OCI images, consider using the [Docker Buildx Plugin](https://woodpecker-ci.org/plugins/Docker%20Buildx) instead. +::: + +First we need to define a servie running a docker with the `dind` tag. This service must run in privileged mode: + +```yaml +services: + - name: docker + image: docker:27.4-dind + privileged: true + ports: + - 2376 +``` + +Next we need to set up TLS communication between the `dind` service and the step that wants to communicate with the docker daemon (since Unauthenticated TCP connections have been deprecated [as of docker v26](https://github.com/docker/cli/blob/v27.4.0/docs/deprecated.md#unauthenticated-tcp-connections) and will ve removed in release v28). + +We can achieve this by letting the daemon generate TLS certificates for us and share them with the client via a volume mount in the agent (`/opt/woodpeckerci/dind-certs` in the example below). + +```diff +services: + - name: docker + image: docker:27.4-dind + privileged: true ++ environment: ++ DOCKER_TLS_CERTDIR: /dind-certs ++ volumes: ++ - /opt/woodpeckerci/dind-certs:/dind-certs + ports: + - 2376 +``` +In the step that needs access to the daemon we need to: + +1. Set the `DOCKER_*` environment variables shown below, setting up the connection with the daemon. These are standardized environment variables that should work with the docker client used by your framework of choice (e.g. [TestContainers](https://testcontainers.com/), [Spring Boot Docker Compose](https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-docker-compose) or similar). +2. Mount the volume where the daemon has created the certificates (`/opt/woodpeckerci/dind-certs`) + +In this example we test the connection with the vanilla docker client: + +```diff +steps: + - name: test + image: docker:27.4-cli ++ environment: ++ DOCKER_HOST: "tcp://docker:2376" ++ DOCKER_CERT_PATH: "/dind-certs/client"27.4-cli ++ DOCKER_TLS_VERIFY: "1" ++ volumes: ++ - /opt/woodpeckerci/dind-certs:/dind-certs + commands: + - docker version +``` + +This step should output version information of the client and the server if everything has been set correctly. + +Complete example: + +```yaml +steps: + - name: test + image: docker:27.4-cli + environment: + DOCKER_HOST: "tcp://docker:2376" + DOCKER_CERT_PATH: "/dind-certs/client"27.4-cli + DOCKER_TLS_VERIFY: "1" + volumes: + - /opt/woodpeckerci/dind-certs:/dind-certs + commands: + - docker version + +services: + - name: docker + image: docker:27.4-dind + privileged: true + environment: + DOCKER_TLS_CERTDIR: /dind-certs + volumes: + - /opt/woodpeckerci/dind-certs:/dind-certs + ports: + - 2376 +``` diff --git a/docs/versioned_docs/version-2.8/30-administration/00-getting-started.md b/docs/versioned_docs/version-2.8/30-administration/00-getting-started.md index 668a38792..8bb1b0a71 100644 --- a/docs/versioned_docs/version-2.8/30-administration/00-getting-started.md +++ b/docs/versioned_docs/version-2.8/30-administration/00-getting-started.md @@ -1,4 +1,4 @@ -# Gettings started +# Getting started A Woodpecker deployment consists of two parts: @@ -45,7 +45,7 @@ By default Woodpecker uses a SQLite database which requires zero installation or ## Forge -What would be a CI/CD system without any code? By connecting Woodpecker to your [forge](../20-usage/15-terminology/index.md) like GitHub or Gitea you can start running pipelines on events like pushes or pull requests. Woodpecker will also use your forge for authentication and to report back the status of your pipelines. See the [forge settings](./11-forges/11-overview.md) to conntect it to Woodpecker. +What would be a CI/CD system without any code? By connecting Woodpecker to your [forge](../20-usage/15-terminology/index.md) like GitHub or Gitea you can start running pipelines on events like pushes or pull requests. Woodpecker will also use your forge for authentication and to report back the status of your pipelines. See the [forge settings](./11-forges/11-overview.md) to connect it to Woodpecker. ## Configuration diff --git a/go.mod b/go.mod index 4793595b5..3364128c3 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ -module go.woodpecker-ci.org/woodpecker/v2 +module go.woodpecker-ci.org/woodpecker/v3 -go 1.23.0 - -toolchain go1.23.4 +go 1.23.4 require ( al.essio.dev/pkg/shellescape v1.5.1 @@ -13,12 +11,12 @@ require ( github.com/6543/logfile-open v1.2.1 github.com/adrg/xdg v0.5.3 github.com/bmatcuk/doublestar/v4 v4.7.1 - github.com/cenkalti/backoff/v4 v4.3.0 + github.com/cenkalti/backoff/v5 v5.0.0 github.com/charmbracelet/huh v0.6.0 github.com/charmbracelet/huh/spinner v0.0.0-20240327025511-ec643317aa10 github.com/distribution/reference v0.6.0 - github.com/docker/cli v27.4.0+incompatible - github.com/docker/docker v27.4.0+incompatible + github.com/docker/cli v27.4.1+incompatible + github.com/docker/docker v27.4.1+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/drone/envsubst v1.0.3 @@ -26,12 +24,13 @@ require ( github.com/franela/goblin v0.0.0-20211003143422-0a4f594942bf github.com/fsnotify/fsnotify v1.8.0 github.com/gdgvda/cron v0.3.0 - github.com/getkin/kin-openapi v0.128.1-0.20241211220347-325cecc5e4e1 + github.com/getkin/kin-openapi v0.128.1-0.20241224102021-cea0a13b906a github.com/gin-gonic/gin v1.10.0 github.com/gitsight/go-vcsurl v1.0.1 github.com/go-sql-driver/mysql v1.8.1 + github.com/go-viper/mapstructure/v2 v2.2.1 github.com/golang-jwt/jwt/v5 v5.2.1 - github.com/google/go-github/v67 v67.0.0 + github.com/google/go-github/v68 v68.0.0 github.com/google/tink/go v1.7.0 github.com/gorilla/securecookie v1.1.2 github.com/hashicorp/go-hclog v1.6.3 @@ -41,10 +40,9 @@ require ( github.com/kinbiko/jsonassert v1.2.0 github.com/lib/pq v1.10.9 github.com/mattn/go-sqlite3 v1.14.24 - github.com/mitchellh/mapstructure v1.5.0 - github.com/moby/moby v27.4.0+incompatible + github.com/moby/moby v27.4.1+incompatible github.com/moby/term v0.5.0 - github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257 + github.com/muesli/termenv v0.15.3-0.20241212154518-8c990cd6cf4b github.com/neticdk/go-bitbucket v1.0.0 github.com/oklog/ulid/v2 v2.1.0 github.com/pkg/errors v0.9.1 @@ -57,18 +55,18 @@ 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.116.0 + gitlab.com/gitlab-org/api/client-go v0.118.0 go.uber.org/multierr v1.11.0 golang.org/x/crypto v0.31.0 - golang.org/x/net v0.32.0 + golang.org/x/net v0.33.0 golang.org/x/oauth2 v0.24.0 golang.org/x/sync v0.10.0 golang.org/x/term v0.27.0 golang.org/x/text v0.21.0 - google.golang.org/grpc v1.68.1 - google.golang.org/protobuf v1.35.2 + google.golang.org/grpc v1.69.2 + 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 @@ -147,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 @@ -193,18 +191,17 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect - go.opentelemetry.io/otel v1.29.0 // indirect + go.opentelemetry.io/otel v1.31.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 // indirect - go.opentelemetry.io/otel/metric v1.29.0 // indirect - go.opentelemetry.io/otel/sdk v1.28.0 // indirect - go.opentelemetry.io/otel/trace v1.29.0 // indirect + go.opentelemetry.io/otel/metric v1.31.0 // indirect + go.opentelemetry.io/otel/trace v1.31.0 // indirect golang.org/x/arch v0.8.0 // indirect golang.org/x/mod v0.22.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/time v0.7.0 // indirect golang.org/x/tools v0.27.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gotest.tools/v3 v3.4.0 // indirect diff --git a/go.sum b/go.sum index a0c08d9c3..15ff0fbd0 100644 --- a/go.sum +++ b/go.sum @@ -52,6 +52,8 @@ github.com/catppuccin/go v0.2.0 h1:ktBeIrIP42b/8FGiScP9sgrWOss3lw0Z5SktRoithGA= github.com/catppuccin/go v0.2.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/cenkalti/backoff/v5 v5.0.0 h1:4ziwFuaVJicDO1ah1Nz1aXXV1caM28PFgf1V5TTFXew= +github.com/cenkalti/backoff/v5 v5.0.0/go.mod h1:rkhZdG3JZukswDf7f0cwqPNk4K0sa+F97BxZthm/crw= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charmbracelet/bubbles v0.20.0 h1:jSZu6qD8cRQ6k9OMfR1WlM+ruM8fkPWkHvQWD9LIutE= @@ -104,10 +106,10 @@ github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDror github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= -github.com/docker/cli v27.4.0+incompatible h1:/nJzWkcI1MDMN+U+px/YXnQWJqnu4J+QKGTfD6ptiTc= -github.com/docker/cli v27.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/docker v27.4.0+incompatible h1:I9z7sQ5qyzO0BfAb9IMOawRkAGxhYsidKiTMcm0DU+A= -github.com/docker/docker v27.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/cli v27.4.1+incompatible h1:VzPiUlRJ/xh+otB75gva3r05isHMo5wXDfPRi5/b4hI= +github.com/docker/cli v27.4.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/docker v27.4.1+incompatible h1:ZJvcY7gfwHn1JF48PfbyXg7Jyt9ZCWDW+GGXOIxEwp4= +github.com/docker/docker v27.4.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= @@ -144,8 +146,8 @@ github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uq github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/gdgvda/cron v0.3.0 h1:Wjj9NSYGzvtjkdZxOjpU749OuJGpcqr/tSxzeeBQGVI= github.com/gdgvda/cron v0.3.0/go.mod h1:caBF+mzTZGtQqFE05T1m6u9OmCASY3EK51XAICf3wio= -github.com/getkin/kin-openapi v0.128.1-0.20241211220347-325cecc5e4e1 h1:jIUT6NT0F50dhHXlFWsGfdJI/5OnnzO6HZHSiSh5DfM= -github.com/getkin/kin-openapi v0.128.1-0.20241211220347-325cecc5e4e1/go.mod h1:gmWI+b/J45xqpyK5wJmRRZse5wefA5H0RDMK46kLUtI= +github.com/getkin/kin-openapi v0.128.1-0.20241224102021-cea0a13b906a h1:z7n7YXcmLsh6Bfl9b28vrzS+RlK9W2PuAgcUK6TJ8QI= +github.com/getkin/kin-openapi v0.128.1-0.20241224102021-cea0a13b906a/go.mod h1:gmWI+b/J45xqpyK5wJmRRZse5wefA5H0RDMK46kLUtI= github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4= github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= @@ -189,6 +191,8 @@ github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1v github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM= github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE= +github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss= +github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= @@ -231,8 +235,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-github/v67 v67.0.0 h1:g11NDAmfaBaCO8qYdI9fsmbaRipHNWRIU/2YGvlh4rg= -github.com/google/go-github/v67 v67.0.0/go.mod h1:zH3K7BxjFndr9QSeFibx4lTKkYS3K9nDanoI1NjaOtY= +github.com/google/go-github/v68 v68.0.0 h1:ZW57zeNZiXTdQ16qrDiZ0k6XucrxZ2CGmoTvcCyQG6s= +github.com/google/go-github/v68 v68.0.0/go.mod h1:K9HAUBovM2sLwM408A18h+wd9vqdLOEqTUCbnRIcx68= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -349,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= @@ -392,12 +396,10 @@ github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBW github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= -github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= -github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= -github.com/moby/moby v27.4.0+incompatible h1:jGXXZCMAmFZS9pKsQqUt9yAPHOC450PM9lbQYPSQnuc= -github.com/moby/moby v27.4.0+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= +github.com/moby/moby v27.4.1+incompatible h1:z6detzbcLRt7U+w4ovHV+8oYpJfpHKTmUbFWPG6cudA= +github.com/moby/moby v27.4.1+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -414,8 +416,8 @@ github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo= -github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257 h1:RNw/zu+CJemcRlDFPjElZUbY2UlI/MA2B3I6PM3Isiw= -github.com/muesli/termenv v0.15.3-0.20240912151726-82936c5ea257/go.mod h1:hxSnBBYLK21Vtq/PHd0S2FYCxBXzBua8ov5s1RobyRQ= +github.com/muesli/termenv v0.15.3-0.20241212154518-8c990cd6cf4b h1:gmVbquSG+bANneniKyO7R2DkOlCat7XDaSfXxHKKQBY= +github.com/muesli/termenv v0.15.3-0.20241212154518-8c990cd6cf4b/go.mod h1:hxSnBBYLK21Vtq/PHd0S2FYCxBXzBua8ov5s1RobyRQ= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/neticdk/go-bitbucket v1.0.0 h1:FPvHEgPHoDwD2VHbpyu2R2gnoWQ867RxZd2FivS4wSw= @@ -546,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= @@ -555,22 +557,24 @@ github.com/zalando/go-keyring v0.2.6 h1:r7Yc3+H+Ux0+M72zacZoItR3UDxeWfKTcabvkI8u github.com/zalando/go-keyring v0.2.6/go.mod h1:2TCrxYrbUNYfNS/Kgy/LSrkSQzZ5UPVH85RwfczwvcI= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -gitlab.com/gitlab-org/api/client-go v0.116.0 h1:Dy534gtZPMrnm3fAcmQRMadrcoUyFO4FQ4rXlSAdHAw= -gitlab.com/gitlab-org/api/client-go v0.116.0/go.mod h1:B29OfnZklmaoiR7uHANh9jTyfWEgmXvZLVEnosw2Dx0= +gitlab.com/gitlab-org/api/client-go v0.118.0 h1:qHIEw+XHt+2xuk4iZGW8fc6t+gTLAGEmTA5Bzp/brxs= +gitlab.com/gitlab-org/api/client-go v0.118.0/go.mod h1:E+X2dndIYDuUfKVP0C3jhkWvTSE00BkLbCsXTY3edDo= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= -go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw= -go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8= +go.opentelemetry.io/otel v1.31.0 h1:NsJcKPIW0D0H3NgzPDHmo0WW6SptzPdqg/L1zsIm2hY= +go.opentelemetry.io/otel v1.31.0/go.mod h1:O0C14Yl9FgkjqcCZAsE053C13OaddMYr/hz6clDkEJE= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0 h1:j9+03ymgYhPKmeXGk5Zu+cIZOlVzd9Zv7QIiyItjFBU= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0/go.mod h1:Y5+XiUG4Emn1hTfciPzGPJaSI+RpDts6BnCIir0SLqk= -go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc= -go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8= -go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= -go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= -go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4= -go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ= +go.opentelemetry.io/otel/metric v1.31.0 h1:FSErL0ATQAmYHUIzSezZibnyVlft1ybhy4ozRPcF2fE= +go.opentelemetry.io/otel/metric v1.31.0/go.mod h1:C3dEloVbLuYoX41KpmAhOqNriGbA+qqH6PQ5E5mUfnY= +go.opentelemetry.io/otel/sdk v1.31.0 h1:xLY3abVHYZ5HSfOg3l2E5LUj2Cwva5Y7yGxnSW9H5Gk= +go.opentelemetry.io/otel/sdk v1.31.0/go.mod h1:TfRbMdhvxIIr/B2N2LQW2S5v9m3gOQ/08KsbbO5BPT0= +go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc= +go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8= +go.opentelemetry.io/otel/trace v1.31.0 h1:ffjsj1aRouKewfr85U2aGagJ46+MvodynlQ1HYdmJys= +go.opentelemetry.io/otel/trace v1.31.0/go.mod h1:TXZkRk7SM2ZQLtR6eoAWQFIHPvzQ06FJAsO1tJg480A= go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -629,8 +633,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= -golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -716,20 +720,20 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 h1:hjSy6tcFQZ171igDaN5QHOw2n6vx40juYbC/x67CEhc= -google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:qpvKtACPCQhAdu3PyQgV4l3LMXZEtft7y8QcarRsp9I= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= -google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0= -google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw= +google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 h1:fVoAXEKA4+yufmbdVYv+SE73+cPZbbbe8paLsHfkK+U= +google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53/go.mod h1:riSXTwQ4+nqmPGtobMFyW5FqVAmIs0St6VPp4Ug7CE4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU= +google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= 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.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= -google.golang.org/protobuf v1.35.2/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= diff --git a/pipeline/backend/backend.go b/pipeline/backend/backend.go index ffb370ed7..960808d9c 100644 --- a/pipeline/backend/backend.go +++ b/pipeline/backend/backend.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func FindBackend(ctx context.Context, backends []types.Backend, backendName string) (types.Backend, error) { diff --git a/pipeline/backend/docker/backend_options.go b/pipeline/backend/docker/backend_options.go index 70dac666b..b7b2a10e1 100644 --- a/pipeline/backend/docker/backend_options.go +++ b/pipeline/backend/docker/backend_options.go @@ -1,9 +1,9 @@ package docker import ( - "github.com/mitchellh/mapstructure" + "github.com/go-viper/mapstructure/v2" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // BackendOptions defines all the advanced options for the docker backend. @@ -16,6 +16,6 @@ func parseBackendOptions(step *backend.Step) (BackendOptions, error) { if step == nil || step.BackendOptions == nil { return result, nil } - err := mapstructure.Decode(step.BackendOptions[EngineName], &result) + err := mapstructure.WeakDecode(step.BackendOptions[EngineName], &result) return result, err } diff --git a/pipeline/backend/docker/backend_options_test.go b/pipeline/backend/docker/backend_options_test.go index 9f19133b4..50fb7f73e 100644 --- a/pipeline/backend/docker/backend_options_test.go +++ b/pipeline/backend/docker/backend_options_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func Test_parseBackendOptions(t *testing.T) { diff --git a/pipeline/backend/docker/convert.go b/pipeline/backend/docker/convert.go index 6a2b10604..5e20c7149 100644 --- a/pipeline/backend/docker/convert.go +++ b/pipeline/backend/docker/convert.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/api/types/container" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/common" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/common" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // Valid container volumes must have at least two components, source and destination. diff --git a/pipeline/backend/docker/convert_test.go b/pipeline/backend/docker/convert_test.go index 7c7951be3..f2948a4a7 100644 --- a/pipeline/backend/docker/convert_test.go +++ b/pipeline/backend/docker/convert_test.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/api/types/system" "github.com/stretchr/testify/assert" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestSplitVolumeParts(t *testing.T) { diff --git a/pipeline/backend/docker/convert_win.go b/pipeline/backend/docker/convert_win.go index 37afef8e3..19cda5116 100644 --- a/pipeline/backend/docker/convert_win.go +++ b/pipeline/backend/docker/convert_win.go @@ -19,7 +19,7 @@ import ( "regexp" "strings" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) const ( diff --git a/pipeline/backend/docker/docker.go b/pipeline/backend/docker/docker.go index 573599f1e..afe43937b 100644 --- a/pipeline/backend/docker/docker.go +++ b/pipeline/backend/docker/docker.go @@ -35,8 +35,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) type docker struct { diff --git a/pipeline/backend/dummy/dummy.go b/pipeline/backend/dummy/dummy.go index cdf08c8aa..5e56f7fbb 100644 --- a/pipeline/backend/dummy/dummy.go +++ b/pipeline/backend/dummy/dummy.go @@ -29,7 +29,7 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) type dummy struct { diff --git a/pipeline/backend/dummy/dummy_test.go b/pipeline/backend/dummy/dummy_test.go index f0c3d8586..44e4034ae 100644 --- a/pipeline/backend/dummy/dummy_test.go +++ b/pipeline/backend/dummy/dummy_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/dummy" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/dummy" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestSmalPipelineDummyRun(t *testing.T) { diff --git a/pipeline/backend/kubernetes/backend_options.go b/pipeline/backend/kubernetes/backend_options.go index 1d5fd6caa..4dbc2c14a 100644 --- a/pipeline/backend/kubernetes/backend_options.go +++ b/pipeline/backend/kubernetes/backend_options.go @@ -1,9 +1,9 @@ package kubernetes import ( - "github.com/mitchellh/mapstructure" + "github.com/go-viper/mapstructure/v2" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // BackendOptions defines all the advanced options for the kubernetes backend. @@ -89,6 +89,6 @@ func parseBackendOptions(step *backend.Step) (BackendOptions, error) { if step == nil || step.BackendOptions == nil { return result, nil } - err := mapstructure.Decode(step.BackendOptions[EngineName], &result) + err := mapstructure.WeakDecode(step.BackendOptions[EngineName], &result) return result, err } diff --git a/pipeline/backend/kubernetes/backend_options_test.go b/pipeline/backend/kubernetes/backend_options_test.go index f1a42aa19..ff44202c8 100644 --- a/pipeline/backend/kubernetes/backend_options_test.go +++ b/pipeline/backend/kubernetes/backend_options_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func Test_parseBackendOptions(t *testing.T) { @@ -114,6 +114,23 @@ func Test_parseBackendOptions(t *testing.T) { }, }, }, + { + name: "number options", + step: &backend.Step{BackendOptions: map[string]any{ + "kubernetes": map[string]any{ + "resources": map[string]any{ + "requests": map[string]int{"memory": 128, "cpu": 1000}, + "limits": map[string]int{"memory": 256, "cpu": 2}, + }, + }, + }}, + want: BackendOptions{ + Resources: Resources{ + Requests: map[string]string{"memory": "128", "cpu": "1000"}, + Limits: map[string]string{"memory": "256", "cpu": "2"}, + }, + }, + }, } for _, tt := range tests { diff --git a/pipeline/backend/kubernetes/kubernetes.go b/pipeline/backend/kubernetes/kubernetes.go index 443c3d669..7aa11893e 100644 --- a/pipeline/backend/kubernetes/kubernetes.go +++ b/pipeline/backend/kubernetes/kubernetes.go @@ -37,7 +37,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) const ( diff --git a/pipeline/backend/kubernetes/pod.go b/pipeline/backend/kubernetes/pod.go index 81bbc45af..42a04356c 100644 --- a/pipeline/backend/kubernetes/pod.go +++ b/pipeline/backend/kubernetes/pod.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/common" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/common" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) const ( diff --git a/pipeline/backend/kubernetes/pod_test.go b/pipeline/backend/kubernetes/pod_test.go index cc7cbccc3..01aa95ecb 100644 --- a/pipeline/backend/kubernetes/pod_test.go +++ b/pipeline/backend/kubernetes/pod_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestPodName(t *testing.T) { diff --git a/pipeline/backend/kubernetes/secrets.go b/pipeline/backend/kubernetes/secrets.go index 96ef84593..3acba1e07 100644 --- a/pipeline/backend/kubernetes/secrets.go +++ b/pipeline/backend/kubernetes/secrets.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/utils" ) type nativeSecretsProcessor struct { diff --git a/pipeline/backend/kubernetes/secrets_test.go b/pipeline/backend/kubernetes/secrets_test.go index 99d06723b..6c2385f1e 100644 --- a/pipeline/backend/kubernetes/secrets_test.go +++ b/pipeline/backend/kubernetes/secrets_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestNativeSecretsEnabled(t *testing.T) { diff --git a/pipeline/backend/kubernetes/service.go b/pipeline/backend/kubernetes/service.go index e187aa4bc..428684648 100644 --- a/pipeline/backend/kubernetes/service.go +++ b/pipeline/backend/kubernetes/service.go @@ -25,7 +25,7 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" int_str "k8s.io/apimachinery/pkg/util/intstr" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) const ( diff --git a/pipeline/backend/kubernetes/service_test.go b/pipeline/backend/kubernetes/service_test.go index 91ce54c1b..ab0217534 100644 --- a/pipeline/backend/kubernetes/service_test.go +++ b/pipeline/backend/kubernetes/service_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestServiceName(t *testing.T) { diff --git a/pipeline/backend/local/clone.go b/pipeline/backend/local/clone.go index 4a9bb5ff4..53fa15034 100644 --- a/pipeline/backend/local/clone.go +++ b/pipeline/backend/local/clone.go @@ -27,7 +27,7 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // checkGitCloneCap check if we have the git binary on hand. @@ -63,10 +63,6 @@ func (e *local) setupClone(state *workflowState) error { // execClone executes a clone-step locally. func (e *local) execClone(ctx context.Context, step *types.Step, state *workflowState, env []string) error { - if scm := step.Environment["CI_REPO_SCM"]; scm != "git" { - return fmt.Errorf("local backend can only clone from git repos, but this repo use '%s'", scm) - } - if err := checkGitCloneCap(); err != nil { return fmt.Errorf("check for git clone capabilities failed: %w", err) } diff --git a/pipeline/backend/local/local.go b/pipeline/backend/local/local.go index 5e11f68f0..ab5eff802 100644 --- a/pipeline/backend/local/local.go +++ b/pipeline/backend/local/local.go @@ -31,7 +31,7 @@ import ( "golang.org/x/text/encoding/unicode" "golang.org/x/text/transform" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) type workflowState struct { diff --git a/pipeline/errors/error.go b/pipeline/errors/error.go index 729839483..4adf7fc62 100644 --- a/pipeline/errors/error.go +++ b/pipeline/errors/error.go @@ -5,7 +5,7 @@ import ( "go.uber.org/multierr" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" ) type LinterErrorData struct { diff --git a/pipeline/errors/error_test.go b/pipeline/errors/error_test.go index 8648c4048..a1658a797 100644 --- a/pipeline/errors/error_test.go +++ b/pipeline/errors/error_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/multierr" - pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" ) func TestGetPipelineErrors(t *testing.T) { diff --git a/pipeline/frontend/metadata/drone_compatibility.go b/pipeline/frontend/metadata/drone_compatibility.go index c6de5510d..d93d14d90 100644 --- a/pipeline/frontend/metadata/drone_compatibility.go +++ b/pipeline/frontend/metadata/drone_compatibility.go @@ -45,7 +45,6 @@ func SetDroneEnviron(env map[string]string) { copyEnv("CI_COMMIT_AUTHOR_AVATAR", "DRONE_COMMIT_AUTHOR_AVATAR", env) // repo copyEnv("CI_REPO", "DRONE_REPO", env) - copyEnv("CI_REPO_SCM", "DRONE_REPO_SCM", env) copyEnv("CI_REPO_OWNER", "DRONE_REPO_OWNER", env) copyEnv("CI_REPO_NAME", "DRONE_REPO_NAME", env) copyEnv("CI_REPO_URL", "DRONE_REPO_LINK", env) @@ -59,6 +58,7 @@ func SetDroneEnviron(env map[string]string) { copyEnv("CI_STEP_NUMBER", "DRONE_STEP_NUMBER", env) env["DRONE_BUILD_STATUS"] = "success" + env["DRONE_REPO_SCM"] = "git" // some quirks diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index f38bdc5e2..e31d0a7ac 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" ) func TestSetDroneEnvironOnPull(t *testing.T) { @@ -59,7 +59,6 @@ CI_REPO_CLONE_URL=https://codeberg.org/Epsilon_02/todo-checker.git CI_REPO_DEFAULT_BRANCH=main CI_REPO_NAME=todo-checker CI_REPO_OWNER=Epsilon_02 -CI_REPO_SCM=git CI_STEP_NAME=wp_01h1z7v5d1tskaqjexw0ng6w7d_0_step_3 CI_STEP_STARTED=1685749339 CI_SYSTEM_PLATFORM=linux/amd64 @@ -164,7 +163,6 @@ CI_REPO_NAME=woodpecker-test CI_REPO_OWNER=test CI_REPO_PRIVATE=false CI_REPO_REMOTE_ID=4 -CI_REPO_SCM=git CI_REPO_TRUSTED=false CI_REPO_TRUSTED_NETWORK=false CI_REPO_TRUSTED_VOLUMES=false diff --git a/pipeline/frontend/metadata/environment.go b/pipeline/frontend/metadata/environment.go index 2d406820e..d95ac8762 100644 --- a/pipeline/frontend/metadata/environment.go +++ b/pipeline/frontend/metadata/environment.go @@ -53,7 +53,6 @@ func (m *Metadata) Environ() map[string]string { setNonEmptyEnvVar(params, "CI_REPO_NAME", repo.Name) setNonEmptyEnvVar(params, "CI_REPO_OWNER", repo.Owner) setNonEmptyEnvVar(params, "CI_REPO_REMOTE_ID", repo.RemoteID) - setNonEmptyEnvVar(params, "CI_REPO_SCM", repo.SCM) setNonEmptyEnvVar(params, "CI_REPO_URL", repo.ForgeURL) setNonEmptyEnvVar(params, "CI_REPO_CLONE_URL", repo.CloneURL) setNonEmptyEnvVar(params, "CI_REPO_CLONE_SSH_URL", repo.CloneSSHURL) diff --git a/pipeline/frontend/metadata/types.go b/pipeline/frontend/metadata/types.go index 5fa56e85e..7b1084f65 100644 --- a/pipeline/frontend/metadata/types.go +++ b/pipeline/frontend/metadata/types.go @@ -34,7 +34,6 @@ type ( Owner string `json:"owner,omitempty"` RemoteID string `json:"remote_id,omitempty"` ForgeURL string `json:"forge_url,omitempty"` - SCM string `json:"scm,omitempty"` CloneURL string `json:"clone_url,omitempty"` CloneSSHURL string `json:"clone_url_ssh,omitempty"` Private bool `json:"private,omitempty"` diff --git a/pipeline/frontend/yaml/compiler/compiler.go b/pipeline/frontend/yaml/compiler/compiler.go index a4c394e92..858b94abf 100644 --- a/pipeline/frontend/yaml/compiler/compiler.go +++ b/pipeline/frontend/yaml/compiler/compiler.go @@ -18,11 +18,11 @@ import ( "fmt" "path" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + yaml_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/utils" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) const ( diff --git a/pipeline/frontend/yaml/compiler/compiler_test.go b/pipeline/frontend/yaml/compiler/compiler_test.go index e3f903817..fc4c68fa9 100644 --- a/pipeline/frontend/yaml/compiler/compiler_test.go +++ b/pipeline/frontend/yaml/compiler/compiler_test.go @@ -19,11 +19,11 @@ import ( "github.com/stretchr/testify/assert" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" - yaml_base_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + yaml_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + yaml_base_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) func TestSecretAvailable(t *testing.T) { diff --git a/pipeline/frontend/yaml/compiler/convert.go b/pipeline/frontend/yaml/compiler/convert.go index fa88f9542..57042d68f 100644 --- a/pipeline/frontend/yaml/compiler/convert.go +++ b/pipeline/frontend/yaml/compiler/convert.go @@ -23,11 +23,11 @@ import ( "github.com/oklog/ulid/v2" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler/settings" - yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/compiler/settings" + yaml_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/utils" ) const ( diff --git a/pipeline/frontend/yaml/compiler/convert_test.go b/pipeline/frontend/yaml/compiler/convert_test.go index 39f01e20b..051cb6a87 100644 --- a/pipeline/frontend/yaml/compiler/convert_test.go +++ b/pipeline/frontend/yaml/compiler/convert_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestConvertPortNumber(t *testing.T) { diff --git a/pipeline/frontend/yaml/compiler/dag.go b/pipeline/frontend/yaml/compiler/dag.go index deb673e4c..fc3e10efc 100644 --- a/pipeline/frontend/yaml/compiler/dag.go +++ b/pipeline/frontend/yaml/compiler/dag.go @@ -17,7 +17,7 @@ package compiler import ( "sort" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) type dagCompilerStep struct { diff --git a/pipeline/frontend/yaml/compiler/dag_test.go b/pipeline/frontend/yaml/compiler/dag_test.go index 620b67776..d0360dab1 100644 --- a/pipeline/frontend/yaml/compiler/dag_test.go +++ b/pipeline/frontend/yaml/compiler/dag_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestConvertDAGToStages(t *testing.T) { diff --git a/pipeline/frontend/yaml/compiler/option.go b/pipeline/frontend/yaml/compiler/option.go index 77e24c4ce..20b419364 100644 --- a/pipeline/frontend/yaml/compiler/option.go +++ b/pipeline/frontend/yaml/compiler/option.go @@ -19,7 +19,7 @@ import ( "path" "strings" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" ) // Option configures a compiler option. diff --git a/pipeline/frontend/yaml/compiler/option_test.go b/pipeline/frontend/yaml/compiler/option_test.go index b4c179d20..061d63e26 100644 --- a/pipeline/frontend/yaml/compiler/option_test.go +++ b/pipeline/frontend/yaml/compiler/option_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) func TestWithWorkspace(t *testing.T) { diff --git a/pipeline/frontend/yaml/constraint/constraint.go b/pipeline/frontend/yaml/constraint/constraint.go index 28c29f2ab..aade4bef2 100644 --- a/pipeline/frontend/yaml/constraint/constraint.go +++ b/pipeline/frontend/yaml/constraint/constraint.go @@ -26,8 +26,8 @@ import ( "go.uber.org/multierr" "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - yamlBaseTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + yamlBaseTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types/base" ) type ( diff --git a/pipeline/frontend/yaml/constraint/constraint_test.go b/pipeline/frontend/yaml/constraint/constraint_test.go index 60936d8c7..a6c68dffa 100644 --- a/pipeline/frontend/yaml/constraint/constraint_test.go +++ b/pipeline/frontend/yaml/constraint/constraint_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" ) func TestConstraint(t *testing.T) { diff --git a/pipeline/frontend/yaml/linter/error.go b/pipeline/frontend/yaml/linter/error.go index 09e243016..96c96ddc0 100644 --- a/pipeline/frontend/yaml/linter/error.go +++ b/pipeline/frontend/yaml/linter/error.go @@ -15,8 +15,8 @@ package linter import ( - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - errorTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + errorTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" ) func newLinterError(message, file, field string, isWarning bool) *errorTypes.PipelineError { diff --git a/pipeline/frontend/yaml/linter/linter.go b/pipeline/frontend/yaml/linter/linter.go index 4bacf4345..79cfa1168 100644 --- a/pipeline/frontend/yaml/linter/linter.go +++ b/pipeline/frontend/yaml/linter/linter.go @@ -20,12 +20,12 @@ import ( "codeberg.org/6543/xyaml" "go.uber.org/multierr" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - errorTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter/schema" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + errorTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter/schema" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/utils" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) // A Linter lints a pipeline configuration. diff --git a/pipeline/frontend/yaml/linter/linter_test.go b/pipeline/frontend/yaml/linter/linter_test.go index b9c88687d..9f78fc9c6 100644 --- a/pipeline/frontend/yaml/linter/linter_test.go +++ b/pipeline/frontend/yaml/linter/linter_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter" ) func TestLint(t *testing.T) { diff --git a/pipeline/frontend/yaml/linter/schema/schema_test.go b/pipeline/frontend/yaml/linter/schema/schema_test.go index 2a5526e24..63ddcdb85 100644 --- a/pipeline/frontend/yaml/linter/schema/schema_test.go +++ b/pipeline/frontend/yaml/linter/schema/schema_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter/schema" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter/schema" ) func TestSchema(t *testing.T) { diff --git a/pipeline/frontend/yaml/matrix/matrix.go b/pipeline/frontend/yaml/matrix/matrix.go index 55855513d..a48ad31d8 100644 --- a/pipeline/frontend/yaml/matrix/matrix.go +++ b/pipeline/frontend/yaml/matrix/matrix.go @@ -19,7 +19,7 @@ import ( "codeberg.org/6543/xyaml" - errorTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" + errorTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" ) const ( diff --git a/pipeline/frontend/yaml/parse.go b/pipeline/frontend/yaml/parse.go index e9a6255fe..07452b6d9 100644 --- a/pipeline/frontend/yaml/parse.go +++ b/pipeline/frontend/yaml/parse.go @@ -17,7 +17,7 @@ package yaml import ( "codeberg.org/6543/xyaml" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" ) // ParseBytes parses the configuration from bytes b. diff --git a/pipeline/frontend/yaml/parse_test.go b/pipeline/frontend/yaml/parse_test.go index 3dec23cd1..5e0b5520e 100644 --- a/pipeline/frontend/yaml/parse_test.go +++ b/pipeline/frontend/yaml/parse_test.go @@ -21,8 +21,8 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - yaml_base_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + yaml_base_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types/base" ) func TestParse(t *testing.T) { diff --git a/pipeline/frontend/yaml/types/container.go b/pipeline/frontend/yaml/types/container.go index d6044edf7..6b6b665d5 100644 --- a/pipeline/frontend/yaml/types/container.go +++ b/pipeline/frontend/yaml/types/container.go @@ -19,9 +19,9 @@ import ( "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/constraint" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/utils" ) type ( diff --git a/pipeline/frontend/yaml/types/container_test.go b/pipeline/frontend/yaml/types/container_test.go index 9b06045c7..537ba5089 100644 --- a/pipeline/frontend/yaml/types/container_test.go +++ b/pipeline/frontend/yaml/types/container_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/constraint" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types/base" ) var containerYaml = []byte(` diff --git a/pipeline/frontend/yaml/types/workflow.go b/pipeline/frontend/yaml/types/workflow.go index f1e753b3d..736e1384b 100644 --- a/pipeline/frontend/yaml/types/workflow.go +++ b/pipeline/frontend/yaml/types/workflow.go @@ -15,7 +15,7 @@ package types import ( - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/constraint" ) type ( diff --git a/pipeline/log/line_writer.go b/pipeline/log/line_writer.go index ff8706f36..b88cbd671 100644 --- a/pipeline/log/line_writer.go +++ b/pipeline/log/line_writer.go @@ -23,8 +23,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/shared" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/shared" ) // LineWriter sends logs to the client. diff --git a/pipeline/log/line_writer_test.go b/pipeline/log/line_writer_test.go index 8a2d6b120..bcff046da 100644 --- a/pipeline/log/line_writer_test.go +++ b/pipeline/log/line_writer_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/mocks" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/log" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/mocks" ) func TestLineWriter(t *testing.T) { diff --git a/pipeline/log/utils_test.go b/pipeline/log/utils_test.go index cbc15b735..9dbd985f0 100644 --- a/pipeline/log/utils_test.go +++ b/pipeline/log/utils_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/log" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/log" ) type testWriter struct { diff --git a/pipeline/logger.go b/pipeline/logger.go index 6eea180d1..765a0333b 100644 --- a/pipeline/logger.go +++ b/pipeline/logger.go @@ -17,7 +17,7 @@ package pipeline import ( "io" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // Logger handles the process logging. diff --git a/pipeline/option.go b/pipeline/option.go index 6be8f3c3d..784cfdbbd 100644 --- a/pipeline/option.go +++ b/pipeline/option.go @@ -17,7 +17,7 @@ package pipeline import ( "context" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // Option configures a runtime option. diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 2b732b444..c7429dbf3 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -26,8 +26,8 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/sync/errgroup" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" ) // TODO: move runtime into "runtime" subpackage diff --git a/pipeline/rpc/mocks/peer.go b/pipeline/rpc/mocks/peer.go index baac63d6e..e8383505b 100644 --- a/pipeline/rpc/mocks/peer.go +++ b/pipeline/rpc/mocks/peer.go @@ -9,7 +9,7 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - rpc "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + rpc "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" ) // Peer is an autogenerated mock type for the Peer type diff --git a/pipeline/rpc/peer.go b/pipeline/rpc/peer.go index c47104210..06790ffec 100644 --- a/pipeline/rpc/peer.go +++ b/pipeline/rpc/peer.go @@ -18,7 +18,7 @@ package rpc import ( "context" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) type ( diff --git a/pipeline/rpc/proto/woodpecker.pb.go b/pipeline/rpc/proto/woodpecker.pb.go index 8f5f059c4..8ded1251e 100644 --- a/pipeline/rpc/proto/woodpecker.pb.go +++ b/pipeline/rpc/proto/woodpecker.pb.go @@ -15,7 +15,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.35.2 +// protoc-gen-go v1.36.0 // protoc v4.24.4 // source: woodpecker.proto @@ -36,16 +36,15 @@ const ( ) type StepState struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + StepUuid string `protobuf:"bytes,1,opt,name=step_uuid,json=stepUuid,proto3" json:"step_uuid,omitempty"` + Started int64 `protobuf:"varint,2,opt,name=started,proto3" json:"started,omitempty"` + Finished int64 `protobuf:"varint,3,opt,name=finished,proto3" json:"finished,omitempty"` + Exited bool `protobuf:"varint,4,opt,name=exited,proto3" json:"exited,omitempty"` + ExitCode int32 `protobuf:"varint,5,opt,name=exit_code,json=exitCode,proto3" json:"exit_code,omitempty"` + Error string `protobuf:"bytes,6,opt,name=error,proto3" json:"error,omitempty"` unknownFields protoimpl.UnknownFields - - StepUuid string `protobuf:"bytes,1,opt,name=step_uuid,json=stepUuid,proto3" json:"step_uuid,omitempty"` - Started int64 `protobuf:"varint,2,opt,name=started,proto3" json:"started,omitempty"` - Finished int64 `protobuf:"varint,3,opt,name=finished,proto3" json:"finished,omitempty"` - Exited bool `protobuf:"varint,4,opt,name=exited,proto3" json:"exited,omitempty"` - ExitCode int32 `protobuf:"varint,5,opt,name=exit_code,json=exitCode,proto3" json:"exit_code,omitempty"` - Error string `protobuf:"bytes,6,opt,name=error,proto3" json:"error,omitempty"` + sizeCache protoimpl.SizeCache } func (x *StepState) Reset() { @@ -121,13 +120,12 @@ func (x *StepState) GetError() string { } type WorkflowState struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Started int64 `protobuf:"varint,4,opt,name=started,proto3" json:"started,omitempty"` + Finished int64 `protobuf:"varint,5,opt,name=finished,proto3" json:"finished,omitempty"` + Error string `protobuf:"bytes,6,opt,name=error,proto3" json:"error,omitempty"` unknownFields protoimpl.UnknownFields - - Started int64 `protobuf:"varint,4,opt,name=started,proto3" json:"started,omitempty"` - Finished int64 `protobuf:"varint,5,opt,name=finished,proto3" json:"finished,omitempty"` - Error string `protobuf:"bytes,6,opt,name=error,proto3" json:"error,omitempty"` + sizeCache protoimpl.SizeCache } func (x *WorkflowState) Reset() { @@ -182,15 +180,14 @@ func (x *WorkflowState) GetError() string { } type LogEntry struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + StepUuid string `protobuf:"bytes,1,opt,name=step_uuid,json=stepUuid,proto3" json:"step_uuid,omitempty"` + Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time,omitempty"` + Line int32 `protobuf:"varint,3,opt,name=line,proto3" json:"line,omitempty"` + Type int32 `protobuf:"varint,4,opt,name=type,proto3" json:"type,omitempty"` // 0 = stdout, 1 = stderr, 2 = exit-code, 3 = metadata, 4 = progress + Data []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"` unknownFields protoimpl.UnknownFields - - StepUuid string `protobuf:"bytes,1,opt,name=step_uuid,json=stepUuid,proto3" json:"step_uuid,omitempty"` - Time int64 `protobuf:"varint,2,opt,name=time,proto3" json:"time,omitempty"` - Line int32 `protobuf:"varint,3,opt,name=line,proto3" json:"line,omitempty"` - Type int32 `protobuf:"varint,4,opt,name=type,proto3" json:"type,omitempty"` // 0 = stdout, 1 = stderr, 2 = exit-code, 3 = metadata, 4 = progress - Data []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"` + sizeCache protoimpl.SizeCache } func (x *LogEntry) Reset() { @@ -259,11 +256,10 @@ func (x *LogEntry) GetData() []byte { } type Filter struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Labels map[string]string `protobuf:"bytes,1,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` unknownFields protoimpl.UnknownFields - - Labels map[string]string `protobuf:"bytes,1,rep,name=labels,proto3" json:"labels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + sizeCache protoimpl.SizeCache } func (x *Filter) Reset() { @@ -304,13 +300,12 @@ func (x *Filter) GetLabels() map[string]string { } type Workflow struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Timeout int64 `protobuf:"varint,2,opt,name=timeout,proto3" json:"timeout,omitempty"` + Payload []byte `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"` unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Timeout int64 `protobuf:"varint,2,opt,name=timeout,proto3" json:"timeout,omitempty"` - Payload []byte `protobuf:"bytes,3,opt,name=payload,proto3" json:"payload,omitempty"` + sizeCache protoimpl.SizeCache } func (x *Workflow) Reset() { @@ -365,11 +360,10 @@ func (x *Workflow) GetPayload() []byte { } type NextRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Filter *Filter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` unknownFields protoimpl.UnknownFields - - Filter *Filter `protobuf:"bytes,1,opt,name=filter,proto3" json:"filter,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NextRequest) Reset() { @@ -410,12 +404,11 @@ func (x *NextRequest) GetFilter() *Filter { } type InitRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + State *WorkflowState `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"` unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - State *WorkflowState `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"` + sizeCache protoimpl.SizeCache } func (x *InitRequest) Reset() { @@ -463,11 +456,10 @@ func (x *InitRequest) GetState() *WorkflowState { } type WaitRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *WaitRequest) Reset() { @@ -508,12 +500,11 @@ func (x *WaitRequest) GetId() string { } type DoneRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + State *WorkflowState `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"` unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - State *WorkflowState `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"` + sizeCache protoimpl.SizeCache } func (x *DoneRequest) Reset() { @@ -561,11 +552,10 @@ func (x *DoneRequest) GetState() *WorkflowState { } type ExtendRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ExtendRequest) Reset() { @@ -606,12 +596,11 @@ func (x *ExtendRequest) GetId() string { } type UpdateRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + State *StepState `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"` unknownFields protoimpl.UnknownFields - - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - State *StepState `protobuf:"bytes,2,opt,name=state,proto3" json:"state,omitempty"` + sizeCache protoimpl.SizeCache } func (x *UpdateRequest) Reset() { @@ -659,11 +648,10 @@ func (x *UpdateRequest) GetState() *StepState { } type LogRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + LogEntries []*LogEntry `protobuf:"bytes,1,rep,name=logEntries,proto3" json:"logEntries,omitempty"` unknownFields protoimpl.UnknownFields - - LogEntries []*LogEntry `protobuf:"bytes,1,rep,name=logEntries,proto3" json:"logEntries,omitempty"` + sizeCache protoimpl.SizeCache } func (x *LogRequest) Reset() { @@ -704,9 +692,9 @@ func (x *LogRequest) GetLogEntries() []*LogEntry { } type Empty struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` unknownFields protoimpl.UnknownFields + sizeCache protoimpl.SizeCache } func (x *Empty) Reset() { @@ -740,11 +728,10 @@ func (*Empty) Descriptor() ([]byte, []int) { } type ReportHealthRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Status string `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` unknownFields protoimpl.UnknownFields - - Status string `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` + sizeCache protoimpl.SizeCache } func (x *ReportHealthRequest) Reset() { @@ -785,15 +772,14 @@ func (x *ReportHealthRequest) GetStatus() string { } type AgentInfo struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Platform string `protobuf:"bytes,1,opt,name=platform,proto3" json:"platform,omitempty"` + Capacity int32 `protobuf:"varint,2,opt,name=capacity,proto3" json:"capacity,omitempty"` + Backend string `protobuf:"bytes,3,opt,name=backend,proto3" json:"backend,omitempty"` + Version string `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"` + CustomLabels map[string]string `protobuf:"bytes,5,rep,name=customLabels,proto3" json:"customLabels,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` unknownFields protoimpl.UnknownFields - - Platform string `protobuf:"bytes,1,opt,name=platform,proto3" json:"platform,omitempty"` - Capacity int32 `protobuf:"varint,2,opt,name=capacity,proto3" json:"capacity,omitempty"` - Backend string `protobuf:"bytes,3,opt,name=backend,proto3" json:"backend,omitempty"` - Version string `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"` - CustomLabels map[string]string `protobuf:"bytes,5,rep,name=customLabels,proto3" json:"customLabels,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + sizeCache protoimpl.SizeCache } func (x *AgentInfo) Reset() { @@ -862,11 +848,10 @@ func (x *AgentInfo) GetCustomLabels() map[string]string { } type RegisterAgentRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Info *AgentInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"` unknownFields protoimpl.UnknownFields - - Info *AgentInfo `protobuf:"bytes,1,opt,name=info,proto3" json:"info,omitempty"` + sizeCache protoimpl.SizeCache } func (x *RegisterAgentRequest) Reset() { @@ -907,12 +892,11 @@ func (x *RegisterAgentRequest) GetInfo() *AgentInfo { } type VersionResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + GrpcVersion int32 `protobuf:"varint,1,opt,name=grpc_version,json=grpcVersion,proto3" json:"grpc_version,omitempty"` + ServerVersion string `protobuf:"bytes,2,opt,name=server_version,json=serverVersion,proto3" json:"server_version,omitempty"` unknownFields protoimpl.UnknownFields - - GrpcVersion int32 `protobuf:"varint,1,opt,name=grpc_version,json=grpcVersion,proto3" json:"grpc_version,omitempty"` - ServerVersion string `protobuf:"bytes,2,opt,name=server_version,json=serverVersion,proto3" json:"server_version,omitempty"` + sizeCache protoimpl.SizeCache } func (x *VersionResponse) Reset() { @@ -960,11 +944,10 @@ func (x *VersionResponse) GetServerVersion() string { } type NextResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Workflow *Workflow `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"` unknownFields protoimpl.UnknownFields - - Workflow *Workflow `protobuf:"bytes,1,opt,name=workflow,proto3" json:"workflow,omitempty"` + sizeCache protoimpl.SizeCache } func (x *NextResponse) Reset() { @@ -1005,11 +988,10 @@ func (x *NextResponse) GetWorkflow() *Workflow { } type RegisterAgentResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + AgentId int64 `protobuf:"varint,1,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty"` unknownFields protoimpl.UnknownFields - - AgentId int64 `protobuf:"varint,1,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *RegisterAgentResponse) Reset() { @@ -1050,12 +1032,11 @@ func (x *RegisterAgentResponse) GetAgentId() int64 { } type AuthRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + AgentToken string `protobuf:"bytes,1,opt,name=agent_token,json=agentToken,proto3" json:"agent_token,omitempty"` + AgentId int64 `protobuf:"varint,2,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty"` unknownFields protoimpl.UnknownFields - - AgentToken string `protobuf:"bytes,1,opt,name=agent_token,json=agentToken,proto3" json:"agent_token,omitempty"` - AgentId int64 `protobuf:"varint,2,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty"` + sizeCache protoimpl.SizeCache } func (x *AuthRequest) Reset() { @@ -1103,13 +1084,12 @@ func (x *AuthRequest) GetAgentId() int64 { } type AuthResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache + state protoimpl.MessageState `protogen:"open.v1"` + Status string `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` + AgentId int64 `protobuf:"varint,2,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty"` + AccessToken string `protobuf:"bytes,3,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"` unknownFields protoimpl.UnknownFields - - Status string `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` - AgentId int64 `protobuf:"varint,2,opt,name=agent_id,json=agentId,proto3" json:"agent_id,omitempty"` - AccessToken string `protobuf:"bytes,3,opt,name=access_token,json=accessToken,proto3" json:"access_token,omitempty"` + sizeCache protoimpl.SizeCache } func (x *AuthResponse) Reset() { diff --git a/server/api/agent.go b/server/api/agent.go index 41132f2c8..116fe5cac 100644 --- a/server/api/agent.go +++ b/server/api/agent.go @@ -20,10 +20,10 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // diff --git a/server/api/agent_test.go b/server/api/agent_test.go index 0a87d99e0..82d5e7c3f 100644 --- a/server/api/agent_test.go +++ b/server/api/agent_test.go @@ -25,13 +25,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - queue_mocks "go.woodpecker-ci.org/woodpecker/v2/server/queue/mocks" - mocks_manager "go.woodpecker-ci.org/woodpecker/v2/server/services/mocks" - store_mocks "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + queue_mocks "go.woodpecker-ci.org/woodpecker/v3/server/queue/mocks" + mocks_manager "go.woodpecker-ci.org/woodpecker/v3/server/services/mocks" + store_mocks "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) var fakeAgent = &model.Agent{ diff --git a/server/api/badge.go b/server/api/badge.go index a06fd8bb2..74378a7b5 100644 --- a/server/api/badge.go +++ b/server/api/badge.go @@ -25,12 +25,12 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/badges" - "go.woodpecker-ci.org/woodpecker/v2/server/ccmenu" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/badges" + "go.woodpecker-ci.org/woodpecker/v3/server/ccmenu" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) // GetBadge @@ -72,7 +72,7 @@ func GetBadge(c *gin.Context) { branch = repo.Branch } - pipeline, err := _store.GetPipelineLast(repo, branch) + pipeline, err := _store.GetPipelineBadge(repo, branch) if err != nil { if !errors.Is(err, types.RecordNotExist) { log.Warn().Err(err).Msg("could not get last pipeline for badge") diff --git a/server/api/cron.go b/server/api/cron.go index 7a3909ec9..78b05b6fe 100644 --- a/server/api/cron.go +++ b/server/api/cron.go @@ -22,12 +22,12 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - cronScheduler "go.woodpecker-ci.org/woodpecker/v2/server/cron" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + cronScheduler "go.woodpecker-ci.org/woodpecker/v3/server/cron" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // GetCron diff --git a/server/api/forge.go b/server/api/forge.go index 57bc1469e..11981bc39 100644 --- a/server/api/forge.go +++ b/server/api/forge.go @@ -20,9 +20,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // GetForges diff --git a/server/api/global_registry.go b/server/api/global_registry.go index b175d4043..5108a76c0 100644 --- a/server/api/global_registry.go +++ b/server/api/global_registry.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetGlobalRegistryList diff --git a/server/api/global_secret.go b/server/api/global_secret.go index 3ede60d7f..1bcc6a825 100644 --- a/server/api/global_secret.go +++ b/server/api/global_secret.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetGlobalSecretList diff --git a/server/api/helper.go b/server/api/helper.go index dbe6ce6e2..591e8f621 100644 --- a/server/api/helper.go +++ b/server/api/helper.go @@ -21,12 +21,12 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func handlePipelineErr(c *gin.Context, err error) { diff --git a/server/api/helper_test.go b/server/api/helper_test.go index 50721f9b3..4dd17b1b8 100644 --- a/server/api/helper_test.go +++ b/server/api/helper_test.go @@ -8,7 +8,7 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" ) func TestHandlePipelineError(t *testing.T) { diff --git a/server/api/hook.go b/server/api/hook.go index 713fca39b..fa79ff04f 100644 --- a/server/api/hook.go +++ b/server/api/hook.go @@ -25,13 +25,13 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) // GetQueueInfo diff --git a/server/api/hook_test.go b/server/api/hook_test.go index 681edf0c8..b107d7c6b 100644 --- a/server/api/hook_test.go +++ b/server/api/hook_test.go @@ -12,17 +12,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/api" - mocks_forge "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - mocks_config_service "go.woodpecker-ci.org/woodpecker/v2/server/services/config/mocks" - mocks_services "go.woodpecker-ci.org/woodpecker/v2/server/services/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/services/permissions" - mocks_registry_service "go.woodpecker-ci.org/woodpecker/v2/server/services/registry/mocks" - mocks_secret_service "go.woodpecker-ci.org/woodpecker/v2/server/services/secret/mocks" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/api" + mocks_forge "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + mocks_config_service "go.woodpecker-ci.org/woodpecker/v3/server/services/config/mocks" + mocks_services "go.woodpecker-ci.org/woodpecker/v3/server/services/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/services/permissions" + mocks_registry_service "go.woodpecker-ci.org/woodpecker/v3/server/services/registry/mocks" + mocks_secret_service "go.woodpecker-ci.org/woodpecker/v3/server/services/secret/mocks" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) func TestHook(t *testing.T) { diff --git a/server/api/login.go b/server/api/login.go index f7db56905..06134b27d 100644 --- a/server/api/login.go +++ b/server/api/login.go @@ -27,14 +27,14 @@ import ( "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/httputil" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/httputil" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) const stateTokenDuration = time.Minute * 5 diff --git a/server/api/login_test.go b/server/api/login_test.go index f76dd721d..3ccb86793 100644 --- a/server/api/login_test.go +++ b/server/api/login_test.go @@ -14,16 +14,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/api" - mocks_forge "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - mocks_services "go.woodpecker-ci.org/woodpecker/v2/server/services/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/services/permissions" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/api" + mocks_forge "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + mocks_services "go.woodpecker-ci.org/woodpecker/v3/server/services/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/services/permissions" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) func TestHandleAuth(t *testing.T) { diff --git a/server/api/metrics/prometheus.go b/server/api/metrics/prometheus.go index b8f65e67b..1564f3926 100644 --- a/server/api/metrics/prometheus.go +++ b/server/api/metrics/prometheus.go @@ -22,7 +22,7 @@ import ( "github.com/gin-gonic/gin" prometheus_http "github.com/prometheus/client_golang/prometheus/promhttp" - "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v3/server" ) // errInvalidToken is returned when the api request token is invalid. diff --git a/server/api/org.go b/server/api/org.go index 889398e7d..765ee3df8 100644 --- a/server/api/org.go +++ b/server/api/org.go @@ -21,10 +21,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // GetOrgs diff --git a/server/api/org_registry.go b/server/api/org_registry.go index 89f16c145..47c6c77c8 100644 --- a/server/api/org_registry.go +++ b/server/api/org_registry.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetOrgRegistry diff --git a/server/api/org_secret.go b/server/api/org_secret.go index c892e8780..47b9dfc53 100644 --- a/server/api/org_secret.go +++ b/server/api/org_secret.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetOrgSecret diff --git a/server/api/pipeline.go b/server/api/pipeline.go index 07fefea62..ce3d1396f 100644 --- a/server/api/pipeline.go +++ b/server/api/pipeline.go @@ -28,13 +28,13 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline/stepbuilder" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) // CreatePipeline diff --git a/server/api/pipeline_test.go b/server/api/pipeline_test.go index dd7043cd5..04c1ba52c 100644 --- a/server/api/pipeline_test.go +++ b/server/api/pipeline_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/server" - forge_mocks "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - mocks_manager "go.woodpecker-ci.org/woodpecker/v2/server/services/mocks" - store_mocks "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/server" + forge_mocks "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + mocks_manager "go.woodpecker-ci.org/woodpecker/v3/server/services/mocks" + store_mocks "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) var fakePipeline = &model.Pipeline{ diff --git a/server/api/registry.go b/server/api/registry.go index 360db1483..79e1dad03 100644 --- a/server/api/registry.go +++ b/server/api/registry.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetRegistry diff --git a/server/api/repo.go b/server/api/repo.go index d5c8a77b4..b1cd17833 100644 --- a/server/api/repo.go +++ b/server/api/repo.go @@ -27,13 +27,13 @@ import ( "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) // PostRepo diff --git a/server/api/repo_secret.go b/server/api/repo_secret.go index cdc58876d..59c73b4ff 100644 --- a/server/api/repo_secret.go +++ b/server/api/repo_secret.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetSecret diff --git a/server/api/signature_public_key.go b/server/api/signature_public_key.go index b9364166b..c3dd717e3 100644 --- a/server/api/signature_public_key.go +++ b/server/api/signature_public_key.go @@ -22,7 +22,7 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v3/server" ) // GetSignaturePublicKey diff --git a/server/api/stream.go b/server/api/stream.go index a620dd068..c948af171 100644 --- a/server/api/stream.go +++ b/server/api/stream.go @@ -27,12 +27,12 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/logging" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/logging" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) const ( diff --git a/server/api/user.go b/server/api/user.go index 7a20da863..9b3690887 100644 --- a/server/api/user.go +++ b/server/api/user.go @@ -23,11 +23,11 @@ import ( "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) // GetSelf diff --git a/server/api/users.go b/server/api/users.go index 1a591d127..35df2724a 100644 --- a/server/api/users.go +++ b/server/api/users.go @@ -21,9 +21,9 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // GetUsers diff --git a/server/api/z.go b/server/api/z.go index 2156f8507..363040bfd 100644 --- a/server/api/z.go +++ b/server/api/z.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // Health diff --git a/server/badges/badges.go b/server/badges/badges.go index 99d82bd90..e05b356fb 100644 --- a/server/badges/badges.go +++ b/server/badges/badges.go @@ -14,7 +14,7 @@ package badges -import "go.woodpecker-ci.org/woodpecker/v2/server/model" +import "go.woodpecker-ci.org/woodpecker/v3/server/model" // cspell:words Verdana diff --git a/server/badges/badges_test.go b/server/badges/badges_test.go index 4f34488c4..7829be16d 100644 --- a/server/badges/badges_test.go +++ b/server/badges/badges_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // Generate an SVG badge based on a pipeline. diff --git a/server/cache/membership.go b/server/cache/membership.go index c29aafdb0..0e7138eaa 100644 --- a/server/cache/membership.go +++ b/server/cache/membership.go @@ -21,9 +21,9 @@ import ( "github.com/jellydator/ttlcache/v3" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // MembershipService is a service to check for user membership. diff --git a/server/ccmenu/cc.go b/server/ccmenu/cc.go index 6c8b77763..bfaf015c0 100644 --- a/server/ccmenu/cc.go +++ b/server/ccmenu/cc.go @@ -20,7 +20,7 @@ import ( "strconv" "time" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // CCMenu displays the pipeline status of projects on a ci server as an item in the Mac's menu bar. diff --git a/server/ccmenu/cc_test.go b/server/ccmenu/cc_test.go index 316b68394..e2b17f513 100644 --- a/server/ccmenu/cc_test.go +++ b/server/ccmenu/cc_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestCC(t *testing.T) { diff --git a/server/config.go b/server/config.go index d9c8bee30..7f9d51a2e 100644 --- a/server/config.go +++ b/server/config.go @@ -18,14 +18,14 @@ package server import ( "time" - "go.woodpecker-ci.org/woodpecker/v2/server/cache" - "go.woodpecker-ci.org/woodpecker/v2/server/logging" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - "go.woodpecker-ci.org/woodpecker/v2/server/services" - "go.woodpecker-ci.org/woodpecker/v2/server/services/log" - "go.woodpecker-ci.org/woodpecker/v2/server/services/permissions" + "go.woodpecker-ci.org/woodpecker/v3/server/cache" + "go.woodpecker-ci.org/woodpecker/v3/server/logging" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/server/services" + "go.woodpecker-ci.org/woodpecker/v3/server/services/log" + "go.woodpecker-ci.org/woodpecker/v3/server/services/permissions" ) var Config = struct { diff --git a/server/cron/cron.go b/server/cron/cron.go index 9fa35aa8c..3460fbaa4 100644 --- a/server/cron/cron.go +++ b/server/cron/cron.go @@ -22,11 +22,11 @@ import ( "github.com/gdgvda/cron" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) const ( diff --git a/server/cron/cron_test.go b/server/cron/cron_test.go index 61f1a2538..ca39839f1 100644 --- a/server/cron/cron_test.go +++ b/server/cron/cron_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server" - mocks_forge "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - mocks_manager "go.woodpecker-ci.org/woodpecker/v2/server/services/mocks" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server" + mocks_forge "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + mocks_manager "go.woodpecker-ci.org/woodpecker/v3/server/services/mocks" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" ) func TestCreatePipeline(t *testing.T) { diff --git a/server/forge/addon/args.go b/server/forge/addon/args.go index d3d85be56..9760124a3 100644 --- a/server/forge/addon/args.go +++ b/server/forge/addon/args.go @@ -15,7 +15,7 @@ package addon import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) type argumentsAuth struct { diff --git a/server/forge/addon/client.go b/server/forge/addon/client.go index ba44c05aa..9640eb782 100644 --- a/server/forge/addon/client.go +++ b/server/forge/addon/client.go @@ -25,9 +25,9 @@ import ( "github.com/hashicorp/go-plugin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // make sure RPC implements forge.Forge. diff --git a/server/forge/addon/plugin.go b/server/forge/addon/plugin.go index 21099cf68..7c7faa833 100644 --- a/server/forge/addon/plugin.go +++ b/server/forge/addon/plugin.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/go-plugin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" ) const pluginKey = "forge" diff --git a/server/forge/addon/server.go b/server/forge/addon/server.go index fc810ae23..abf14e214 100644 --- a/server/forge/addon/server.go +++ b/server/forge/addon/server.go @@ -22,8 +22,8 @@ import ( "github.com/hashicorp/go-plugin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" ) func Serve(impl forge.Forge) { diff --git a/server/forge/bitbucket/bitbucket.go b/server/forge/bitbucket/bitbucket.go index 95facb7f7..bbb5ac43b 100644 --- a/server/forge/bitbucket/bitbucket.go +++ b/server/forge/bitbucket/bitbucket.go @@ -26,13 +26,13 @@ import ( "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) // Bitbucket cloud endpoints. diff --git a/server/forge/bitbucket/bitbucket_test.go b/server/forge/bitbucket/bitbucket_test.go index 452b202d9..a4fe537d1 100644 --- a/server/forge/bitbucket/bitbucket_test.go +++ b/server/forge/bitbucket/bitbucket_test.go @@ -26,10 +26,10 @@ import ( "github.com/franela/goblin" "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_bitbucket(t *testing.T) { diff --git a/server/forge/bitbucket/convert.go b/server/forge/bitbucket/convert.go index f54cb04d3..b7b13c6b4 100644 --- a/server/forge/bitbucket/convert.go +++ b/server/forge/bitbucket/convert.go @@ -23,8 +23,8 @@ import ( "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( @@ -59,14 +59,10 @@ func convertRepo(from *internal.Repo, perm *internal.RepoPerm) *model.Repo { ForgeURL: from.Links.HTML.Href, IsSCMPrivate: from.IsPrivate, Avatar: from.Owner.Links.Avatar.Href, - SCMKind: model.SCMKind(from.Scm), Branch: from.MainBranch.Name, Perm: convertPerm(perm), PREnabled: true, } - if repo.SCMKind == model.RepoHg { - repo.Branch = "default" - } return &repo } diff --git a/server/forge/bitbucket/convert_test.go b/server/forge/bitbucket/convert_test.go index 0765615a8..e28d3926d 100644 --- a/server/forge/bitbucket/convert_test.go +++ b/server/forge/bitbucket/convert_test.go @@ -22,8 +22,8 @@ import ( "github.com/franela/goblin" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_helper(t *testing.T) { @@ -48,7 +48,7 @@ func Test_helper(t *testing.T) { from := &internal.Repo{ FullName: "octocat/hello-world", IsPrivate: true, - Scm: "hg", + Scm: "git", } from.Owner.Links.Avatar.Href = "http://..." from.Links.HTML.Href = "https://bitbucket.org/foo/bar" @@ -61,8 +61,6 @@ func Test_helper(t *testing.T) { g.Assert(to.FullName).Equal(from.FullName) g.Assert(to.Owner).Equal("octocat") g.Assert(to.Name).Equal("hello-world") - g.Assert(to.Branch).Equal("default") - g.Assert(string(to.SCMKind)).Equal(from.Scm) g.Assert(to.IsSCMPrivate).Equal(from.IsPrivate) g.Assert(to.Clone).Equal(from.Links.HTML.Href) g.Assert(to.ForgeURL).Equal(from.Links.HTML.Href) diff --git a/server/forge/bitbucket/internal/client.go b/server/forge/bitbucket/internal/client.go index 52c8ce150..e7a5a74b0 100644 --- a/server/forge/bitbucket/internal/client.go +++ b/server/forge/bitbucket/internal/client.go @@ -26,7 +26,7 @@ import ( "golang.org/x/oauth2" "golang.org/x/oauth2/bitbucket" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/bitbucket/parse.go b/server/forge/bitbucket/parse.go index 82cf8d5cc..7f8b6710b 100644 --- a/server/forge/bitbucket/parse.go +++ b/server/forge/bitbucket/parse.go @@ -19,9 +19,9 @@ import ( "io" "net/http" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( diff --git a/server/forge/bitbucket/parse_test.go b/server/forge/bitbucket/parse_test.go index a5562fc39..0a92ef734 100644 --- a/server/forge/bitbucket/parse_test.go +++ b/server/forge/bitbucket/parse_test.go @@ -22,9 +22,9 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_parser(t *testing.T) { @@ -125,7 +125,6 @@ func Test_parser(t *testing.T) { r, b, err := parseHook(req) g.Assert(err).IsNil() g.Assert(r.FullName).Equal("martinherren1984/publictestrepo") - g.Assert(r.SCMKind).Equal(model.RepoGit) g.Assert(r.Clone).Equal("https://bitbucket.org/martinherren1984/publictestrepo") g.Assert(b.Commit).Equal("c14c1bb05dfb1fdcdf06b31485fff61b0ea44277") g.Assert(b.Message).Equal("a\n") diff --git a/server/forge/bitbucketdatacenter/bitbucketdatacenter.go b/server/forge/bitbucketdatacenter/bitbucketdatacenter.go index 42212895b..ccb7beb4d 100644 --- a/server/forge/bitbucketdatacenter/bitbucketdatacenter.go +++ b/server/forge/bitbucketdatacenter/bitbucketdatacenter.go @@ -25,13 +25,13 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucketdatacenter/internal" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucketdatacenter/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) const listLimit = 250 diff --git a/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go b/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go index 930840eb5..9ccdf1910 100644 --- a/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go +++ b/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go @@ -22,8 +22,8 @@ import ( "github.com/franela/goblin" "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucketdatacenter/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucketdatacenter/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestBitbucketDC(t *testing.T) { diff --git a/server/forge/bitbucketdatacenter/convert.go b/server/forge/bitbucketdatacenter/convert.go index 140cb0a6a..f7c99cf04 100644 --- a/server/forge/bitbucketdatacenter/convert.go +++ b/server/forge/bitbucketdatacenter/convert.go @@ -23,7 +23,7 @@ import ( bb "github.com/neticdk/go-bitbucket/bitbucket" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func convertStatus(status model.StatusValue) bb.BuildStatusState { @@ -56,7 +56,6 @@ func convertRepo(from *bb.Repository, perm *model.Perm, branch string) *model.Re Name: from.Slug, Owner: from.Project.Key, Branch: branch, - SCMKind: model.RepoGit, IsSCMPrivate: true, // Since we have to use Netrc it has to always be private :/ TODO: Is this really true? FullName: fmt.Sprintf("%s/%s", from.Project.Key, from.Slug), Perm: perm, diff --git a/server/forge/bitbucketdatacenter/convert_test.go b/server/forge/bitbucketdatacenter/convert_test.go index 564f00530..cefd006bb 100644 --- a/server/forge/bitbucketdatacenter/convert_test.go +++ b/server/forge/bitbucketdatacenter/convert_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" bb "github.com/neticdk/go-bitbucket/bitbucket" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) //nolint:misspell @@ -83,7 +83,6 @@ func TestHelper(t *testing.T) { g.Assert(to.Name).Equal("REPO") g.Assert(to.Owner).Equal("PRJ") g.Assert(to.Branch).Equal("main") - g.Assert(to.SCMKind).Equal(model.RepoGit) g.Assert(to.FullName).Equal("PRJ/REPO") g.Assert(to.Perm).Equal(perm) g.Assert(to.Clone).Equal("https://git.domain/clone") diff --git a/server/forge/common/status.go b/server/forge/common/status.go index 845edc2bf..3e07f041b 100644 --- a/server/forge/common/status.go +++ b/server/forge/common/status.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func GetPipelineStatusContext(repo *model.Repo, pipeline *model.Pipeline, workflow *model.Workflow) string { diff --git a/server/forge/common/status_test.go b/server/forge/common/status_test.go index cbf3fd9e1..04e834355 100644 --- a/server/forge/common/status_test.go +++ b/server/forge/common/status_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestGetPipelineStatusContext(t *testing.T) { diff --git a/server/forge/common/utils.go b/server/forge/common/utils.go index c29d912e6..549e048cc 100644 --- a/server/forge/common/utils.go +++ b/server/forge/common/utils.go @@ -22,8 +22,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func ExtractHostFromCloneURL(cloneURL string) (string, error) { diff --git a/server/forge/common/utils_test.go b/server/forge/common/utils_test.go index 159902912..c979b25b4 100644 --- a/server/forge/common/utils_test.go +++ b/server/forge/common/utils_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" ) func Test_Netrc(t *testing.T) { diff --git a/server/forge/forge.go b/server/forge/forge.go index 4169e60d0..f5102a73e 100644 --- a/server/forge/forge.go +++ b/server/forge/forge.go @@ -21,8 +21,8 @@ import ( "context" "net/http" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // TODO: use pagination diff --git a/server/forge/forgejo/forgejo.go b/server/forge/forgejo/forgejo.go index 8930f8bca..1e5a0d418 100644 --- a/server/forge/forgejo/forgejo.go +++ b/server/forge/forgejo/forgejo.go @@ -30,13 +30,13 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/forgejo/forgejo_test.go b/server/forge/forgejo/forgejo_test.go index 7c27e8f03..1941e646e 100644 --- a/server/forge/forgejo/forgejo_test.go +++ b/server/forge/forgejo/forgejo_test.go @@ -25,11 +25,11 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/forgejo/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/forgejo/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func Test_forgejo(t *testing.T) { diff --git a/server/forge/forgejo/helper.go b/server/forge/forgejo/helper.go index b6e4a2785..394f6a133 100644 --- a/server/forge/forgejo/helper.go +++ b/server/forge/forgejo/helper.go @@ -24,8 +24,8 @@ import ( "codeberg.org/mvdkleijn/forgejo-sdk/forgejo" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) // toRepo converts a Forgejo repository to a Woodpecker repository. @@ -37,7 +37,6 @@ func toRepo(from *forgejo.Repository) *model.Repo { ) return &model.Repo{ ForgeRemoteID: model.ForgeRemoteID(fmt.Sprint(from.ID)), - SCMKind: model.RepoGit, Name: name, Owner: from.Owner.UserName, FullName: from.FullName, diff --git a/server/forge/forgejo/helper_test.go b/server/forge/forgejo/helper_test.go index b87996d1e..8f0ae2316 100644 --- a/server/forge/forgejo/helper_test.go +++ b/server/forge/forgejo/helper_test.go @@ -21,9 +21,9 @@ import ( "codeberg.org/mvdkleijn/forgejo-sdk/forgejo" "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/forgejo/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/forgejo/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func Test_parse(t *testing.T) { diff --git a/server/forge/forgejo/parse.go b/server/forge/forgejo/parse.go index 88be0cf4b..609c73a40 100644 --- a/server/forge/forgejo/parse.go +++ b/server/forge/forgejo/parse.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( diff --git a/server/forge/forgejo/parse_test.go b/server/forge/forgejo/parse_test.go index 9415d9975..a40777521 100644 --- a/server/forge/forgejo/parse_test.go +++ b/server/forge/forgejo/parse_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/forgejo/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/forgejo/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestForgejoParser(t *testing.T) { @@ -55,7 +55,6 @@ func TestForgejoParser(t *testing.T) { Clone: "https://codeberg.org/meisam/woodpecktester.git", CloneSSH: "git@codeberg.org:meisam/woodpecktester.git", Branch: "main", - SCMKind: "git", PREnabled: true, Perm: &model.Perm{ Pull: true, @@ -90,7 +89,6 @@ func TestForgejoParser(t *testing.T) { ForgeURL: "http://forgejo.golang.org/gordon/hello-world", Clone: "http://forgejo.golang.org/gordon/hello-world.git", CloneSSH: "git@forgejo.golang.org:gordon/hello-world.git", - SCMKind: "git", IsSCMPrivate: true, Perm: &model.Perm{ Pull: true, @@ -126,7 +124,6 @@ func TestForgejoParser(t *testing.T) { Clone: "http://127.0.0.1:3000/Test-CI/multi-line-secrets.git", CloneSSH: "ssh://git@127.0.0.1:2200/Test-CI/multi-line-secrets.git", Branch: "main", - SCMKind: "git", Perm: &model.Perm{ Pull: true, Push: true, @@ -161,7 +158,6 @@ func TestForgejoParser(t *testing.T) { Clone: "http://forgejo.golang.org/gordon/hello-world.git", CloneSSH: "git@forgejo.golang.org:gordon/hello-world.git", Branch: "main", - SCMKind: "git", IsSCMPrivate: true, Perm: &model.Perm{ Pull: true, @@ -195,7 +191,6 @@ func TestForgejoParser(t *testing.T) { Clone: "https://forgejo.golang.org/gordon/hello-world.git", CloneSSH: "", Branch: "main", - SCMKind: "git", IsSCMPrivate: true, Perm: &model.Perm{ Pull: true, @@ -233,7 +228,6 @@ func TestForgejoParser(t *testing.T) { Clone: "http://127.0.0.1:3000/Test-CI/multi-line-secrets.git", CloneSSH: "ssh://git@127.0.0.1:2200/Test-CI/multi-line-secrets.git", Branch: "main", - SCMKind: "git", PREnabled: true, IsSCMPrivate: false, Perm: &model.Perm{ @@ -275,7 +269,6 @@ func TestForgejoParser(t *testing.T) { Clone: "https://forgejo.com/anbraten/test-repo.git", CloneSSH: "git@forgejo.com:anbraten/test-repo.git", Branch: "main", - SCMKind: "git", PREnabled: true, Perm: &model.Perm{ Pull: true, @@ -313,7 +306,6 @@ func TestForgejoParser(t *testing.T) { Clone: "https://forgejo.com/anbraten/test-repo.git", CloneSSH: "git@forgejo.com:anbraten/test-repo.git", Branch: "main", - SCMKind: "git", PREnabled: true, Perm: &model.Perm{ Pull: true, @@ -351,7 +343,6 @@ func TestForgejoParser(t *testing.T) { Clone: "https://git.xxx/anbraten/demo.git", CloneSSH: "ssh://git@git.xxx:22/anbraten/demo.git", Branch: "main", - SCMKind: "git", PREnabled: true, IsSCMPrivate: true, Perm: &model.Perm{ diff --git a/server/forge/gitea/gitea.go b/server/forge/gitea/gitea.go index 73499826c..7b3788d06 100644 --- a/server/forge/gitea/gitea.go +++ b/server/forge/gitea/gitea.go @@ -32,13 +32,13 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/gitea/gitea_test.go b/server/forge/gitea/gitea_test.go index b8f7a45be..7b7f20dce 100644 --- a/server/forge/gitea/gitea_test.go +++ b/server/forge/gitea/gitea_test.go @@ -26,11 +26,11 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitea/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func Test_gitea(t *testing.T) { diff --git a/server/forge/gitea/helper.go b/server/forge/gitea/helper.go index 56ec0953e..9420d5fff 100644 --- a/server/forge/gitea/helper.go +++ b/server/forge/gitea/helper.go @@ -25,8 +25,8 @@ import ( "code.gitea.io/sdk/gitea" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) // toRepo converts a Gitea repository to a Woodpecker repository. @@ -38,7 +38,6 @@ func toRepo(from *gitea.Repository) *model.Repo { ) return &model.Repo{ ForgeRemoteID: model.ForgeRemoteID(fmt.Sprint(from.ID)), - SCMKind: model.RepoGit, Name: name, Owner: from.Owner.UserName, FullName: from.FullName, diff --git a/server/forge/gitea/helper_test.go b/server/forge/gitea/helper_test.go index f8d36f371..2f1cb94fd 100644 --- a/server/forge/gitea/helper_test.go +++ b/server/forge/gitea/helper_test.go @@ -22,9 +22,9 @@ import ( "code.gitea.io/sdk/gitea" "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitea/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func Test_parse(t *testing.T) { diff --git a/server/forge/gitea/parse.go b/server/forge/gitea/parse.go index 7b2629b2e..ae873d64d 100644 --- a/server/forge/gitea/parse.go +++ b/server/forge/gitea/parse.go @@ -23,8 +23,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( diff --git a/server/forge/gitea/parse_test.go b/server/forge/gitea/parse_test.go index a37384464..437376611 100644 --- a/server/forge/gitea/parse_test.go +++ b/server/forge/gitea/parse_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitea/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestGiteaParser(t *testing.T) { @@ -56,7 +56,6 @@ func TestGiteaParser(t *testing.T) { Clone: "https://codeberg.org/meisam/woodpecktester.git", CloneSSH: "git@codeberg.org:meisam/woodpecktester.git", Branch: "main", - SCMKind: "git", PREnabled: true, Perm: &model.Perm{ Pull: true, @@ -91,7 +90,6 @@ func TestGiteaParser(t *testing.T) { ForgeURL: "http://gitea.golang.org/gordon/hello-world", Clone: "http://gitea.golang.org/gordon/hello-world.git", CloneSSH: "git@gitea.golang.org:gordon/hello-world.git", - SCMKind: "git", IsSCMPrivate: true, Perm: &model.Perm{ Pull: true, @@ -127,7 +125,6 @@ func TestGiteaParser(t *testing.T) { Clone: "http://127.0.0.1:3000/Test-CI/multi-line-secrets.git", CloneSSH: "ssh://git@127.0.0.1:2200/Test-CI/multi-line-secrets.git", Branch: "main", - SCMKind: "git", Perm: &model.Perm{ Pull: true, Push: true, @@ -162,7 +159,6 @@ func TestGiteaParser(t *testing.T) { Clone: "http://gitea.golang.org/gordon/hello-world.git", CloneSSH: "git@gitea.golang.org:gordon/hello-world.git", Branch: "main", - SCMKind: "git", IsSCMPrivate: true, Perm: &model.Perm{ Pull: true, @@ -196,7 +192,6 @@ func TestGiteaParser(t *testing.T) { Clone: "https://gitea.golang.org/gordon/hello-world.git", CloneSSH: "", Branch: "main", - SCMKind: "git", IsSCMPrivate: true, Perm: &model.Perm{ Pull: true, @@ -234,7 +229,6 @@ func TestGiteaParser(t *testing.T) { Clone: "http://127.0.0.1:3000/Test-CI/multi-line-secrets.git", CloneSSH: "ssh://git@127.0.0.1:2200/Test-CI/multi-line-secrets.git", Branch: "main", - SCMKind: "git", PREnabled: true, IsSCMPrivate: false, Perm: &model.Perm{ @@ -276,7 +270,6 @@ func TestGiteaParser(t *testing.T) { Clone: "https://gitea.com/anbraten/test-repo.git", CloneSSH: "git@gitea.com:anbraten/test-repo.git", Branch: "main", - SCMKind: "git", PREnabled: true, Perm: &model.Perm{ Pull: true, @@ -314,7 +307,6 @@ func TestGiteaParser(t *testing.T) { Clone: "https://gitea.com/anbraten/test-repo.git", CloneSSH: "git@gitea.com:anbraten/test-repo.git", Branch: "main", - SCMKind: "git", PREnabled: true, Perm: &model.Perm{ Pull: true, @@ -352,7 +344,6 @@ func TestGiteaParser(t *testing.T) { Clone: "https://git.xxx/anbraten/demo.git", CloneSSH: "ssh://git@git.xxx:22/anbraten/demo.git", Branch: "main", - SCMKind: "git", PREnabled: true, IsSCMPrivate: true, Perm: &model.Perm{ diff --git a/server/forge/github/convert.go b/server/forge/github/convert.go index 19088a516..d76002ab3 100644 --- a/server/forge/github/convert.go +++ b/server/forge/github/convert.go @@ -18,9 +18,9 @@ package github import ( "fmt" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( @@ -94,7 +94,6 @@ func convertRepo(from *github.Repository) *model.Repo { Owner: from.GetOwner().GetLogin(), Avatar: from.GetOwner().GetAvatarURL(), Perm: convertPerm(from.GetPermissions()), - SCMKind: model.RepoGit, PREnabled: true, } return repo @@ -152,7 +151,6 @@ func convertRepoHook(eventRepo *github.PushEventRepository) *model.Repo { Clone: eventRepo.GetCloneURL(), CloneSSH: eventRepo.GetSSHURL(), Branch: eventRepo.GetDefaultBranch(), - SCMKind: model.RepoGit, PREnabled: true, } if repo.FullName == "" { diff --git a/server/forge/github/convert_test.go b/server/forge/github/convert_test.go index 3e9295cf6..2b4998bb5 100644 --- a/server/forge/github/convert_test.go +++ b/server/forge/github/convert_test.go @@ -19,9 +19,9 @@ import ( "testing" "github.com/franela/goblin" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_helper(t *testing.T) { @@ -66,15 +66,15 @@ func Test_helper(t *testing.T) { g.It("should convert repository list", func() { from := []*github.Repository{ { - Private: github.Bool(false), - FullName: github.String("octocat/hello-world"), - Name: github.String("hello-world"), + Private: github.Ptr(false), + FullName: github.Ptr("octocat/hello-world"), + Name: github.Ptr("hello-world"), Owner: &github.User{ - AvatarURL: github.String("http://..."), - Login: github.String("octocat"), + AvatarURL: github.Ptr("http://..."), + Login: github.Ptr("octocat"), }, - HTMLURL: github.String("https://github.com/octocat/hello-world"), - CloneURL: github.String("https://github.com/octocat/hello-world.git"), + HTMLURL: github.Ptr("https://github.com/octocat/hello-world"), + CloneURL: github.Ptr("https://github.com/octocat/hello-world.git"), Permissions: map[string]bool{ "push": true, "pull": true, @@ -92,15 +92,15 @@ func Test_helper(t *testing.T) { g.It("should convert repository", func() { from := github.Repository{ - FullName: github.String("octocat/hello-world"), - Name: github.String("hello-world"), - HTMLURL: github.String("https://github.com/octocat/hello-world"), - CloneURL: github.String("https://github.com/octocat/hello-world.git"), - DefaultBranch: github.String("develop"), - Private: github.Bool(true), + FullName: github.Ptr("octocat/hello-world"), + Name: github.Ptr("hello-world"), + HTMLURL: github.Ptr("https://github.com/octocat/hello-world"), + CloneURL: github.Ptr("https://github.com/octocat/hello-world.git"), + DefaultBranch: github.Ptr("develop"), + Private: github.Ptr(true), Owner: &github.User{ - AvatarURL: github.String("http://..."), - Login: github.String("octocat"), + AvatarURL: github.Ptr("http://..."), + Login: github.Ptr("octocat"), }, Permissions: map[string]bool{ "push": true, @@ -115,7 +115,6 @@ func Test_helper(t *testing.T) { g.Assert(to.Owner).Equal("octocat") g.Assert(to.Name).Equal("hello-world") g.Assert(to.Branch).Equal("develop") - g.Assert(string(to.SCMKind)).Equal("git") g.Assert(to.IsSCMPrivate).IsTrue() g.Assert(to.Clone).Equal("https://github.com/octocat/hello-world.git") g.Assert(to.ForgeURL).Equal("https://github.com/octocat/hello-world") @@ -138,8 +137,8 @@ func Test_helper(t *testing.T) { g.It("should convert team", func() { from := &github.Organization{ - Login: github.String("octocat"), - AvatarURL: github.String("http://..."), + Login: github.Ptr("octocat"), + AvatarURL: github.Ptr("http://..."), } to := convertTeam(from) g.Assert(to.Login).Equal("octocat") @@ -149,8 +148,8 @@ func Test_helper(t *testing.T) { g.It("should convert team list", func() { from := []*github.Organization{ { - Login: github.String("octocat"), - AvatarURL: github.String("http://..."), + Login: github.Ptr("octocat"), + AvatarURL: github.Ptr("http://..."), }, } to := convertTeamList(from) @@ -160,14 +159,14 @@ func Test_helper(t *testing.T) { g.It("should convert a repository from webhook", func() { from := &github.PushEventRepository{Owner: &github.User{}} - from.Owner.Login = github.String("octocat") - from.Owner.Name = github.String("octocat") - from.Name = github.String("hello-world") - from.FullName = github.String("octocat/hello-world") - from.Private = github.Bool(true) - from.HTMLURL = github.String("https://github.com/octocat/hello-world") - from.CloneURL = github.String("https://github.com/octocat/hello-world.git") - from.DefaultBranch = github.String("develop") + from.Owner.Login = github.Ptr("octocat") + from.Owner.Name = github.Ptr("octocat") + from.Name = github.Ptr("hello-world") + from.FullName = github.Ptr("octocat/hello-world") + from.Private = github.Ptr(true) + from.HTMLURL = github.Ptr("https://github.com/octocat/hello-world") + from.CloneURL = github.Ptr("https://github.com/octocat/hello-world.git") + from.DefaultBranch = github.Ptr("develop") repo := convertRepoHook(from) g.Assert(repo.Owner).Equal(*from.Owner.Login) @@ -181,28 +180,28 @@ func Test_helper(t *testing.T) { g.It("should convert a pull request from webhook", func() { from := &github.PullRequestEvent{ - Action: github.String(actionOpen), + Action: github.Ptr(actionOpen), PullRequest: &github.PullRequest{ - State: github.String(stateOpen), - HTMLURL: github.String("https://github.com/octocat/hello-world/pulls/42"), - Number: github.Int(42), - Title: github.String("Updated README.md"), + State: github.Ptr(stateOpen), + HTMLURL: github.Ptr("https://github.com/octocat/hello-world/pulls/42"), + Number: github.Ptr(42), + Title: github.Ptr("Updated README.md"), Base: &github.PullRequestBranch{ - Ref: github.String("main"), + Ref: github.Ptr("main"), }, Head: &github.PullRequestBranch{ - Ref: github.String("changes"), - SHA: github.String("f72fc19"), + Ref: github.Ptr("changes"), + SHA: github.Ptr("f72fc19"), Repo: &github.Repository{ - CloneURL: github.String("https://github.com/octocat/hello-world-fork"), + CloneURL: github.Ptr("https://github.com/octocat/hello-world-fork"), }, }, User: &github.User{ - Login: github.String("octocat"), - AvatarURL: github.String("https://avatars1.githubusercontent.com/u/583231"), + Login: github.Ptr("octocat"), + AvatarURL: github.Ptr("https://avatars1.githubusercontent.com/u/583231"), }, }, Sender: &github.User{ - Login: github.String("octocat"), + Login: github.Ptr("octocat"), }, } pull, _, pipeline, err := parsePullHook(from, true) @@ -222,15 +221,15 @@ func Test_helper(t *testing.T) { g.It("should convert a deployment from webhook", func() { from := &github.DeploymentEvent{Deployment: &github.Deployment{}, Sender: &github.User{}} - from.Deployment.Description = github.String(":shipit:") - from.Deployment.Environment = github.String("production") - from.Deployment.Task = github.String("deploy") - from.Deployment.ID = github.Int64(42) - from.Deployment.Ref = github.String("main") - from.Deployment.SHA = github.String("f72fc19") - from.Deployment.URL = github.String("https://github.com/octocat/hello-world") - from.Sender.Login = github.String("octocat") - from.Sender.AvatarURL = github.String("https://avatars1.githubusercontent.com/u/583231") + from.Deployment.Description = github.Ptr(":shipit:") + from.Deployment.Environment = github.Ptr("production") + from.Deployment.Task = github.Ptr("deploy") + from.Deployment.ID = github.Ptr(int64(42)) + from.Deployment.Ref = github.Ptr("main") + from.Deployment.SHA = github.Ptr("f72fc19") + from.Deployment.URL = github.Ptr("https://github.com/octocat/hello-world") + from.Sender.Login = github.Ptr("octocat") + from.Sender.AvatarURL = github.Ptr("https://avatars1.githubusercontent.com/u/583231") _, pipeline := parseDeployHook(from) g.Assert(pipeline.Event).Equal(model.EventDeploy) @@ -245,14 +244,14 @@ func Test_helper(t *testing.T) { g.It("should convert a push from webhook", func() { from := &github.PushEvent{Sender: &github.User{}, Repo: &github.PushEventRepository{}, HeadCommit: &github.HeadCommit{Author: &github.CommitAuthor{}}} - from.Sender.Login = github.String("octocat") - from.Sender.AvatarURL = github.String("https://avatars1.githubusercontent.com/u/583231") - from.Repo.CloneURL = github.String("https://github.com/octocat/hello-world.git") - from.HeadCommit.Author.Email = github.String("github.String(octocat@github.com") - from.HeadCommit.Message = github.String("updated README.md") - from.HeadCommit.URL = github.String("https://github.com/octocat/hello-world") - from.HeadCommit.ID = github.String("f72fc19") - from.Ref = github.String("refs/heads/main") + from.Sender.Login = github.Ptr("octocat") + from.Sender.AvatarURL = github.Ptr("https://avatars1.githubusercontent.com/u/583231") + from.Repo.CloneURL = github.Ptr("https://github.com/octocat/hello-world.git") + from.HeadCommit.Author.Email = github.Ptr("github.Ptr(octocat@github.com") + from.HeadCommit.Message = github.Ptr("updated README.md") + from.HeadCommit.URL = github.Ptr("https://github.com/octocat/hello-world") + from.HeadCommit.ID = github.Ptr("f72fc19") + from.Ref = github.Ptr("refs/heads/main") _, pipeline := parsePushHook(from) g.Assert(pipeline.Event).Equal(model.EventPush) @@ -268,7 +267,7 @@ func Test_helper(t *testing.T) { g.It("should convert a tag from webhook", func() { from := &github.PushEvent{} - from.Ref = github.String("refs/tags/v1.0.0") + from.Ref = github.Ptr("refs/tags/v1.0.0") _, pipeline := parsePushHook(from) g.Assert(pipeline.Event).Equal(model.EventTag) @@ -277,8 +276,8 @@ func Test_helper(t *testing.T) { g.It("should convert tag's base branch from webhook to pipeline's branch ", func() { from := &github.PushEvent{} - from.Ref = github.String("refs/tags/v1.0.0") - from.BaseRef = github.String("refs/heads/main") + from.Ref = github.Ptr("refs/tags/v1.0.0") + from.BaseRef = github.Ptr("refs/heads/main") _, pipeline := parsePushHook(from) g.Assert(pipeline.Event).Equal(model.EventTag) @@ -287,8 +286,8 @@ func Test_helper(t *testing.T) { g.It("should not convert tag's base_ref from webhook if not prefixed with 'ref/heads/'", func() { from := &github.PushEvent{} - from.Ref = github.String("refs/tags/v1.0.0") - from.BaseRef = github.String("refs/refs/main") + from.Ref = github.Ptr("refs/tags/v1.0.0") + from.BaseRef = github.Ptr("refs/refs/main") _, pipeline := parsePushHook(from) g.Assert(pipeline.Event).Equal(model.EventTag) diff --git a/server/forge/github/github.go b/server/forge/github/github.go index a117b71d6..31ad44c3a 100644 --- a/server/forge/github/github.go +++ b/server/forge/github/github.go @@ -27,17 +27,17 @@ import ( "strings" "time" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" "github.com/rs/zerolog/log" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( @@ -529,18 +529,18 @@ func (c *client) Status(ctx context.Context, user *model.User, repo *model.Repo, id, _ := strconv.Atoi(matches[1]) _, _, err := client.Repositories.CreateDeploymentStatus(ctx, repo.Owner, repo.Name, int64(id), &github.DeploymentStatusRequest{ - State: github.String(convertStatus(pipeline.Status)), - Description: github.String(common.GetPipelineStatusDescription(pipeline.Status)), - LogURL: github.String(common.GetPipelineStatusURL(repo, pipeline, nil)), + State: github.Ptr(convertStatus(pipeline.Status)), + Description: github.Ptr(common.GetPipelineStatusDescription(pipeline.Status)), + LogURL: github.Ptr(common.GetPipelineStatusURL(repo, pipeline, nil)), }) return err } _, _, err := client.Repositories.CreateStatus(ctx, repo.Owner, repo.Name, pipeline.Commit, &github.RepoStatus{ - Context: github.String(common.GetPipelineStatusContext(repo, pipeline, workflow)), - State: github.String(convertStatus(workflow.State)), - Description: github.String(common.GetPipelineStatusDescription(workflow.State)), - TargetURL: github.String(common.GetPipelineStatusURL(repo, pipeline, workflow)), + Context: github.Ptr(common.GetPipelineStatusContext(repo, pipeline, workflow)), + State: github.Ptr(convertStatus(workflow.State)), + Description: github.Ptr(common.GetPipelineStatusDescription(workflow.State)), + TargetURL: github.Ptr(common.GetPipelineStatusURL(repo, pipeline, workflow)), }) return err } @@ -553,7 +553,7 @@ func (c *client) Activate(ctx context.Context, u *model.User, r *model.Repo, lin } client := c.newClientToken(ctx, u.AccessToken) hook := &github.Hook{ - Name: github.String("web"), + Name: github.Ptr("web"), Events: []string{ "push", "pull_request", @@ -561,7 +561,7 @@ func (c *client) Activate(ctx context.Context, u *model.User, r *model.Repo, lin }, Config: &github.HookConfig{ URL: &link, - ContentType: github.String("form"), + ContentType: github.Ptr("form"), }, } _, _, err := client.Repositories.CreateHook(ctx, r.Owner, r.Name, hook) diff --git a/server/forge/github/github_test.go b/server/forge/github/github_test.go index ede197a99..c2d46bfc7 100644 --- a/server/forge/github/github_test.go +++ b/server/forge/github/github_test.go @@ -23,8 +23,8 @@ import ( "github.com/franela/goblin" "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/github/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/github/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_github(t *testing.T) { diff --git a/server/forge/github/parse.go b/server/forge/github/parse.go index 61084d857..7df728984 100644 --- a/server/forge/github/parse.go +++ b/server/forge/github/parse.go @@ -22,11 +22,11 @@ import ( "net/http" "strings" - "github.com/google/go-github/v67/github" + "github.com/google/go-github/v68/github" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/github/parse_test.go b/server/forge/github/parse_test.go index 225bfd3c9..c316dd9ab 100644 --- a/server/forge/github/parse_test.go +++ b/server/forge/github/parse_test.go @@ -25,9 +25,9 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/github/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/github/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( diff --git a/server/forge/gitlab/convert.go b/server/forge/gitlab/convert.go index 116e19846..c8ccdc119 100644 --- a/server/forge/gitlab/convert.go +++ b/server/forge/gitlab/convert.go @@ -23,8 +23,8 @@ import ( "gitlab.com/gitlab-org/api/client-go" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/gitlab/gitlab.go b/server/forge/gitlab/gitlab.go index 54ba25029..fbe145002 100644 --- a/server/forge/gitlab/gitlab.go +++ b/server/forge/gitlab/gitlab.go @@ -31,13 +31,13 @@ import ( "gitlab.com/gitlab-org/api/client-go" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/gitlab/gitlab_test.go b/server/forge/gitlab/gitlab_test.go index 4c4042cd3..04619acaf 100644 --- a/server/forge/gitlab/gitlab_test.go +++ b/server/forge/gitlab/gitlab_test.go @@ -26,9 +26,9 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitlab/testdata" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitlab/testdata" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func load(config string) *GitLab { diff --git a/server/forge/gitlab/status.go b/server/forge/gitlab/status.go index dd28819df..be03b7c9d 100644 --- a/server/forge/gitlab/status.go +++ b/server/forge/gitlab/status.go @@ -17,7 +17,7 @@ package gitlab import ( "gitlab.com/gitlab-org/api/client-go" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // getStatus is a helper that converts a Woodpecker status to a Gitlab status. diff --git a/server/forge/mocks/forge.go b/server/forge/mocks/forge.go index 3deb6b960..0c6ec4421 100644 --- a/server/forge/mocks/forge.go +++ b/server/forge/mocks/forge.go @@ -12,9 +12,9 @@ import ( mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/v2/server/model" + model "go.woodpecker-ci.org/woodpecker/v3/server/model" - types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" ) // Forge is an autogenerated mock type for the Forge type @@ -282,7 +282,7 @@ func (_m *Forge) Login(ctx context.Context, r *types.OAuthRequest) (*model.User, return r0, r1, r2 } -// Name provides a mock function with given fields: +// Name provides a mock function with no fields func (_m *Forge) Name() string { ret := _m.Called() @@ -528,7 +528,7 @@ func (_m *Forge) Teams(ctx context.Context, u *model.User) ([]*model.Team, error return r0, r1 } -// URL provides a mock function with given fields: +// URL provides a mock function with no fields func (_m *Forge) URL() string { ret := _m.Called() diff --git a/server/forge/refresh.go b/server/forge/refresh.go index 931b67d6e..0b0e5fac5 100644 --- a/server/forge/refresh.go +++ b/server/forge/refresh.go @@ -20,8 +20,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // Refresher refreshes an oauth token and expiration for the given user. It diff --git a/server/forge/setup/setup.go b/server/forge/setup/setup.go index 510a71e8f..e534ab112 100644 --- a/server/forge/setup/setup.go +++ b/server/forge/setup/setup.go @@ -7,15 +7,15 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/addon" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucketdatacenter" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/forgejo" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/github" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitlab" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/addon" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucketdatacenter" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/forgejo" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitea" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/github" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitlab" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Forge(forge *model.Forge) (forge.Forge, error) { @@ -44,7 +44,11 @@ func setupBitbucket(forge *model.Forge) (forge.Forge, error) { Client: forge.Client, Secret: forge.ClientSecret, } - log.Trace().Msgf("Forge (bitbucket) opts: %#v", opts) + log.Debug(). + Bool("client-set", opts.Client != ""). + Bool("secret-set", opts.Secret != ""). + Str("type", string(forge.Type)). + Msg("setting up forge") return bitbucket.New(opts) } @@ -64,7 +68,14 @@ func setupGitea(forge *model.Forge) (forge.Forge, error) { if len(opts.URL) == 0 { return nil, fmt.Errorf("WOODPECKER_GITEA_URL must be set") } - log.Trace().Msgf("Forge (gitea) opts: %#v", opts) + log.Debug(). + Str("url", opts.URL). + Str("oauth-host", opts.OAuthHost). + Bool("skip-verify", opts.SkipVerify). + Bool("client-set", opts.Client != ""). + Bool("secret-set", opts.Secret != ""). + Str("type", string(forge.Type)). + Msg("setting up forge") return gitea.New(opts) } @@ -84,18 +95,34 @@ func setupForgejo(forge *model.Forge) (forge.Forge, error) { if len(opts.URL) == 0 { return nil, fmt.Errorf("WOODPECKER_FORGEJO_URL must be set") } - log.Trace().Msgf("Forge (forgejo) opts: %#v", opts) + log.Debug(). + Str("url", opts.URL). + Str("oauth2-url", opts.OAuth2URL). + Bool("skip-verify", opts.SkipVerify). + Bool("client-set", opts.Client != ""). + Bool("secret-set", opts.Secret != ""). + Str("type", string(forge.Type)). + Msg("setting up forge") return forgejo.New(opts) } func setupGitLab(forge *model.Forge) (forge.Forge, error) { - return gitlab.New(gitlab.Opts{ + opts := gitlab.Opts{ URL: forge.URL, ClientID: forge.Client, ClientSecret: forge.ClientSecret, SkipVerify: forge.SkipVerify, OAuthHost: forge.OAuthHost, - }) + } + log.Debug(). + Str("url", opts.URL). + Str("oauth-host", opts.OAuthHost). + Bool("skip-verify", opts.SkipVerify). + Bool("client-id-set", opts.ClientID != ""). + Bool("client-secret-set", opts.ClientSecret != ""). + Str("type", string(forge.Type)). + Msg("setting up forge") + return gitlab.New(opts) } func setupGitHub(forge *model.Forge) (forge.Forge, error) { @@ -118,7 +145,16 @@ func setupGitHub(forge *model.Forge) (forge.Forge, error) { OnlyPublic: publicOnly, OAuthHost: forge.OAuthHost, } - log.Trace().Msgf("Forge (github) opts: %#v", opts) + log.Debug(). + Str("url", opts.URL). + Str("oauth-host", opts.OAuthHost). + Bool("merge-ref", opts.MergeRef). + Bool("only-public", opts.OnlyPublic). + Bool("skip-verify", opts.SkipVerify). + Bool("client-set", opts.Client != ""). + Bool("secret-set", opts.Secret != ""). + Str("type", string(forge.Type)). + Msg("setting up forge") return github.New(opts) } @@ -140,16 +176,22 @@ func setupBitbucketDatacenter(forge *model.Forge) (forge.Forge, error) { Password: gitPassword, OAuthHost: forge.OAuthHost, } - log.Trace().Msgf("Forge (bitbucketdatacenter) opts: %#v", opts) + log.Debug(). + Str("url", opts.URL). + Str("oauth-host", opts.OAuthHost). + Bool("client-id-set", opts.ClientID != ""). + Bool("client-secret-set", opts.ClientSecret != ""). + Str("type", string(forge.Type)). + Msg("setting up forge") return bitbucketdatacenter.New(opts) } func setupAddon(forge *model.Forge) (forge.Forge, error) { executable, ok := forge.AdditionalOptions["executable"].(string) if !ok { - return nil, fmt.Errorf("missing git-username") + return nil, fmt.Errorf("missing addon executable") } - log.Trace().Msgf("Forge (addon) executable: %#v", executable) + log.Debug().Str("executable", executable).Msg("setting up forge") return addon.Load(executable) } diff --git a/server/grpc/auth_server.go b/server/grpc/auth_server.go index a12317f93..c009b6eca 100644 --- a/server/grpc/auth_server.go +++ b/server/grpc/auth_server.go @@ -21,10 +21,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) type WoodpeckerAuthServer struct { diff --git a/server/grpc/filter.go b/server/grpc/filter.go index 521aeb912..6df125bcd 100644 --- a/server/grpc/filter.go +++ b/server/grpc/filter.go @@ -15,9 +15,9 @@ package grpc import ( - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" ) func createFilterFunc(agentFilter rpc.Filter) queue.FilterFn { diff --git a/server/grpc/filter_test.go b/server/grpc/filter_test.go index e074f797f..1599a58ca 100644 --- a/server/grpc/filter_test.go +++ b/server/grpc/filter_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestCreateFilterFunc(t *testing.T) { diff --git a/server/grpc/rpc.go b/server/grpc/rpc.go index 9297f3502..379fa7900 100644 --- a/server/grpc/rpc.go +++ b/server/grpc/rpc.go @@ -28,15 +28,15 @@ import ( "github.com/rs/zerolog/log" grpcMetadata "google.golang.org/grpc/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/logging" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/logging" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // updateAgentLastWorkDelay the delay before the LastWork info should be updated. diff --git a/server/grpc/rpc_test.go b/server/grpc/rpc_test.go index 60bd8193a..7b071cf1b 100644 --- a/server/grpc/rpc_test.go +++ b/server/grpc/rpc_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/mock" "google.golang.org/grpc/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" ) func TestRegisterAgent(t *testing.T) { diff --git a/server/grpc/server.go b/server/grpc/server.go index 2cfa8548a..4a79ef447 100644 --- a/server/grpc/server.go +++ b/server/grpc/server.go @@ -22,13 +22,13 @@ import ( prometheus_auto "github.com/prometheus/client_golang/prometheus/promauto" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" - "go.woodpecker-ci.org/woodpecker/v2/server/logging" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v3/server/logging" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // WoodpeckerServer is a grpc server implementation. diff --git a/server/logging/log.go b/server/logging/log.go index 0e713644f..ec7afe861 100644 --- a/server/logging/log.go +++ b/server/logging/log.go @@ -20,7 +20,7 @@ import ( logger "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // TODO: (bradrydzewski) writing to subscribers is currently a blocking diff --git a/server/logging/log_test.go b/server/logging/log_test.go index f84a5b8f3..52020e6cc 100644 --- a/server/logging/log_test.go +++ b/server/logging/log_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestLogging(t *testing.T) { diff --git a/server/logging/logging.go b/server/logging/logging.go index e8eb80117..80f1854f8 100644 --- a/server/logging/logging.go +++ b/server/logging/logging.go @@ -18,7 +18,7 @@ import ( "context" "errors" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // ErrNotFound is returned when the log does not exist. diff --git a/server/model/const.go b/server/model/const.go index e37171259..d0ab526e7 100644 --- a/server/model/const.go +++ b/server/model/const.go @@ -77,16 +77,6 @@ func (s StatusValue) Validate() error { } } -// SCMKind represent different version control systems. -type SCMKind string // @name SCMKind - -const ( - RepoGit SCMKind = "git" - RepoHg SCMKind = "hg" - RepoFossil SCMKind = "fossil" - RepoPerforce SCMKind = "perforce" -) - // RepoVisibility represent to what state a repo in woodpecker is visible to others. type RepoVisibility string // @name RepoVisibility diff --git a/server/model/pipeline.go b/server/model/pipeline.go index 6268e08a6..b74e8184a 100644 --- a/server/model/pipeline.go +++ b/server/model/pipeline.go @@ -16,7 +16,7 @@ package model import ( - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" ) type Pipeline struct { diff --git a/server/model/repo.go b/server/model/repo.go index b833ce407..9adf87c26 100644 --- a/server/model/repo.go +++ b/server/model/repo.go @@ -57,7 +57,6 @@ type Repo struct { Clone string `json:"clone_url,omitempty" xorm:"varchar(1000) 'clone'"` CloneSSH string `json:"clone_url_ssh" xorm:"varchar(1000) 'clone_ssh'"` Branch string `json:"default_branch,omitempty" xorm:"varchar(500) 'branch'"` - SCMKind SCMKind `json:"scm,omitempty" xorm:"varchar(50) 'scm'"` PREnabled bool `json:"pr_enabled" xorm:"DEFAULT TRUE 'pr_enabled'"` Timeout int64 `json:"timeout,omitempty" xorm:"timeout"` Visibility RepoVisibility `json:"visibility" xorm:"varchar(10) 'visibility'"` @@ -108,7 +107,6 @@ func (r *Repo) Update(from *Repo) { r.FullName = from.FullName r.Avatar = from.Avatar r.ForgeURL = from.ForgeURL - r.SCMKind = from.SCMKind r.PREnabled = from.PREnabled if len(from.Clone) > 0 { r.Clone = from.Clone diff --git a/server/pipeline/approve.go b/server/pipeline/approve.go index ff4336c4f..d66b128ac 100644 --- a/server/pipeline/approve.go +++ b/server/pipeline/approve.go @@ -21,10 +21,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // Approve update the status to pending for a blocked pipeline so it can be executed. diff --git a/server/pipeline/cancel.go b/server/pipeline/cancel.go index 253e1d586..e39c20010 100644 --- a/server/pipeline/cancel.go +++ b/server/pipeline/cancel.go @@ -20,11 +20,11 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // Cancel the pipeline and returns the status. diff --git a/server/pipeline/config.go b/server/pipeline/config.go index f54066593..0e550d54c 100644 --- a/server/pipeline/config.go +++ b/server/pipeline/config.go @@ -15,10 +15,10 @@ package pipeline import ( - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline/stepbuilder" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func findOrPersistPipelineConfig(store store.Store, currentPipeline *model.Pipeline, forgeYamlConfig *forge_types.FileMeta) (*model.Config, error) { diff --git a/server/pipeline/create.go b/server/pipeline/create.go index 90983d8d0..2a5ebb6da 100644 --- a/server/pipeline/create.go +++ b/server/pipeline/create.go @@ -22,12 +22,12 @@ import ( "github.com/rs/zerolog/log" - pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) var skipPipelineRegex = regexp.MustCompile(`\[(?i:ci *skip|skip *ci)\]`) diff --git a/server/pipeline/decline.go b/server/pipeline/decline.go index 2d098fdc5..d717f878f 100644 --- a/server/pipeline/decline.go +++ b/server/pipeline/decline.go @@ -21,9 +21,9 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // Decline updates the status to declined for blocked pipelines. diff --git a/server/pipeline/gated.go b/server/pipeline/gated.go index bd59122f9..4a4f3dc36 100644 --- a/server/pipeline/gated.go +++ b/server/pipeline/gated.go @@ -14,7 +14,7 @@ package pipeline -import "go.woodpecker-ci.org/woodpecker/v2/server/model" +import "go.woodpecker-ci.org/woodpecker/v3/server/model" func setApprovalState(repo *model.Repo, pipeline *model.Pipeline) { if !needsApproval(repo, pipeline) { diff --git a/server/pipeline/gated_test.go b/server/pipeline/gated_test.go index 2b95313ec..76004ff3d 100644 --- a/server/pipeline/gated_test.go +++ b/server/pipeline/gated_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestSetGatedState(t *testing.T) { diff --git a/server/pipeline/helper.go b/server/pipeline/helper.go index e8e3400a5..bc1417793 100644 --- a/server/pipeline/helper.go +++ b/server/pipeline/helper.go @@ -19,8 +19,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func updatePipelineStatus(ctx context.Context, forge forge.Forge, pipeline *model.Pipeline, repo *model.Repo, user *model.User) { diff --git a/server/pipeline/items.go b/server/pipeline/items.go index c34ffa96e..72080414b 100644 --- a/server/pipeline/items.go +++ b/server/pipeline/items.go @@ -21,14 +21,14 @@ import ( "github.com/rs/zerolog/log" - pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline/stepbuilder" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/compiler" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func parsePipeline(forge forge.Forge, store store.Store, currentPipeline *model.Pipeline, user *model.User, repo *model.Repo, yamls []*forge_types.FileMeta, envs map[string]string) ([]*stepbuilder.Item, error) { diff --git a/server/pipeline/items_test.go b/server/pipeline/items_test.go index bec0c2337..53b9db126 100644 --- a/server/pipeline/items_test.go +++ b/server/pipeline/items_test.go @@ -3,9 +3,9 @@ package pipeline import ( "testing" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - sharedPipeline "go.woodpecker-ci.org/woodpecker/v2/server/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + sharedPipeline "go.woodpecker-ci.org/woodpecker/v3/server/pipeline/stepbuilder" ) func TestSetPipelineStepsOnPipeline(t *testing.T) { diff --git a/server/pipeline/pipeline_status.go b/server/pipeline/pipeline_status.go index 95ed21817..fbac2776f 100644 --- a/server/pipeline/pipeline_status.go +++ b/server/pipeline/pipeline_status.go @@ -18,9 +18,9 @@ package pipeline import ( "time" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func UpdateToStatusRunning(store store.Store, pipeline model.Pipeline, started int64) (*model.Pipeline, error) { diff --git a/server/pipeline/pipeline_status_test.go b/server/pipeline/pipeline_status_test.go index ce4ba657b..1f9b87580 100644 --- a/server/pipeline/pipeline_status_test.go +++ b/server/pipeline/pipeline_status_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" ) func mockStorePipeline(t *testing.T) store.Store { diff --git a/server/pipeline/queue.go b/server/pipeline/queue.go index a17669a1f..002dbf3a9 100644 --- a/server/pipeline/queue.go +++ b/server/pipeline/queue.go @@ -20,10 +20,10 @@ import ( "fmt" "maps" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline/stepbuilder" ) func queuePipeline(ctx context.Context, repo *model.Repo, pipelineItems []*stepbuilder.Item) error { diff --git a/server/pipeline/restart.go b/server/pipeline/restart.go index 3c997a290..844f437b3 100644 --- a/server/pipeline/restart.go +++ b/server/pipeline/restart.go @@ -21,10 +21,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // Restart a pipeline by creating a new one out of the old and start it. diff --git a/server/pipeline/start.go b/server/pipeline/start.go index ae4a24a62..82625319f 100644 --- a/server/pipeline/start.go +++ b/server/pipeline/start.go @@ -19,10 +19,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline/stepbuilder" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // start a pipeline, make sure it was stored persistent in the store before. diff --git a/server/pipeline/step_status.go b/server/pipeline/step_status.go index 8ee5b83ba..364384a05 100644 --- a/server/pipeline/step_status.go +++ b/server/pipeline/step_status.go @@ -18,10 +18,10 @@ package pipeline import ( "time" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func UpdateStepStatus(store store.Store, step *model.Step, state rpc.StepState) error { diff --git a/server/pipeline/step_status_test.go b/server/pipeline/step_status_test.go index c2e9564cf..1d6212880 100644 --- a/server/pipeline/step_status_test.go +++ b/server/pipeline/step_status_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" ) func mockStoreStep(t *testing.T) store.Store { diff --git a/server/pipeline/stepbuilder/metadata.go b/server/pipeline/stepbuilder/metadata.go index 52d79b4bb..8ceb0dbcd 100644 --- a/server/pipeline/stepbuilder/metadata.go +++ b/server/pipeline/stepbuilder/metadata.go @@ -19,9 +19,9 @@ import ( "net/url" "strings" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // MetadataFromStruct return the metadata from a pipeline will run with. @@ -48,7 +48,6 @@ func MetadataFromStruct(forge metadata.ServerForge, repo *model.Repo, pipeline, Owner: repo.Owner, RemoteID: fmt.Sprint(repo.ForgeRemoteID), ForgeURL: repo.ForgeURL, - SCM: string(repo.SCMKind), CloneURL: repo.Clone, CloneSSHURL: repo.CloneSSH, Private: repo.IsSCMPrivate, diff --git a/server/pipeline/stepbuilder/metadata_test.go b/server/pipeline/stepbuilder/metadata_test.go index 005d7b6cd..c63680d94 100644 --- a/server/pipeline/stepbuilder/metadata_test.go +++ b/server/pipeline/stepbuilder/metadata_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestMetadataFromStruct(t *testing.T) { @@ -57,7 +57,7 @@ func TestMetadataFromStruct(t *testing.T) { { name: "Test with forge", forge: forge, - repo: &model.Repo{FullName: "testUser/testRepo", ForgeURL: "https://gitea.com/testUser/testRepo", Clone: "https://gitea.com/testUser/testRepo.git", CloneSSH: "git@gitea.com:testUser/testRepo.git", Branch: "main", IsSCMPrivate: true, SCMKind: "git"}, + repo: &model.Repo{FullName: "testUser/testRepo", ForgeURL: "https://gitea.com/testUser/testRepo", Clone: "https://gitea.com/testUser/testRepo.git", CloneSSH: "git@gitea.com:testUser/testRepo.git", Branch: "main", IsSCMPrivate: true}, pipeline: &model.Pipeline{Number: 3, ChangedFiles: []string{"test.go", "markdown file.md"}}, prev: &model.Pipeline{Number: 2}, workflow: &model.Workflow{Name: "hello"}, @@ -65,7 +65,7 @@ func TestMetadataFromStruct(t *testing.T) { expectedMetadata: metadata.Metadata{ Forge: metadata.Forge{Type: "gitea", URL: "https://gitea.com"}, Sys: metadata.System{Name: "woodpecker", Host: "example.com", URL: "https://example.com"}, - Repo: metadata.Repo{Owner: "testUser", Name: "testRepo", ForgeURL: "https://gitea.com/testUser/testRepo", CloneURL: "https://gitea.com/testUser/testRepo.git", CloneSSHURL: "git@gitea.com:testUser/testRepo.git", Branch: "main", Private: true, SCM: "git"}, + Repo: metadata.Repo{Owner: "testUser", Name: "testRepo", ForgeURL: "https://gitea.com/testUser/testRepo", CloneURL: "https://gitea.com/testUser/testRepo.git", CloneSSHURL: "git@gitea.com:testUser/testRepo.git", Branch: "main", Private: true}, Curr: metadata.Pipeline{ Number: 3, Commit: metadata.Commit{ChangedFiles: []string{"test.go", "markdown file.md"}}, @@ -82,7 +82,7 @@ func TestMetadataFromStruct(t *testing.T) { "CI_PREV_PIPELINE_FINISHED": "0", "CI_PREV_PIPELINE_NUMBER": "2", "CI_PREV_PIPELINE_PARENT": "0", "CI_PREV_PIPELINE_STARTED": "0", "CI_PREV_PIPELINE_URL": "https://example.com/repos/0/pipeline/2", "CI_REPO": "testUser/testRepo", "CI_REPO_CLONE_URL": "https://gitea.com/testUser/testRepo.git", "CI_REPO_CLONE_SSH_URL": "git@gitea.com:testUser/testRepo.git", "CI_REPO_DEFAULT_BRANCH": "main", "CI_REPO_NAME": "testRepo", "CI_REPO_OWNER": "testUser", "CI_REPO_PRIVATE": "true", - "CI_REPO_SCM": "git", "CI_REPO_TRUSTED": "false", "CI_REPO_TRUSTED_NETWORK": "false", "CI_REPO_TRUSTED_SECURITY": "false", "CI_REPO_TRUSTED_VOLUMES": "false", + "CI_REPO_TRUSTED": "false", "CI_REPO_TRUSTED_NETWORK": "false", "CI_REPO_TRUSTED_SECURITY": "false", "CI_REPO_TRUSTED_VOLUMES": "false", "CI_REPO_URL": "https://gitea.com/testUser/testRepo", "CI_STEP_NUMBER": "0", "CI_STEP_URL": "https://example.com/repos/0/pipeline/3", "CI_SYSTEM_HOST": "example.com", "CI_SYSTEM_NAME": "woodpecker", "CI_SYSTEM_URL": "https://example.com", "CI_WORKFLOW_NAME": "hello", "CI_WORKFLOW_NUMBER": "0", }, diff --git a/server/pipeline/stepbuilder/stepBuilder.go b/server/pipeline/stepbuilder/stepBuilder.go index 8145bf9e4..3d0b55e7e 100644 --- a/server/pipeline/stepbuilder/stepBuilder.go +++ b/server/pipeline/stepbuilder/stepBuilder.go @@ -25,18 +25,18 @@ import ( "github.com/rs/zerolog/log" "go.uber.org/multierr" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - errorTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" - yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/v2/server" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + errorTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/compiler" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/matrix" + yaml_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // StepBuilder Takes the hook data and the yaml and returns in internal data model. diff --git a/server/pipeline/stepbuilder/stepBuilder_test.go b/server/pipeline/stepbuilder/stepBuilder_test.go index c9b616e4d..bca38e798 100644 --- a/server/pipeline/stepbuilder/stepBuilder_test.go +++ b/server/pipeline/stepbuilder/stepBuilder_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestGlobalEnvsubst(t *testing.T) { diff --git a/server/pipeline/topic.go b/server/pipeline/topic.go index 26c9f432b..8bcb52efd 100644 --- a/server/pipeline/topic.go +++ b/server/pipeline/topic.go @@ -20,9 +20,9 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" ) // publishToTopic publishes message to UI clients. diff --git a/server/pipeline/workflow_status.go b/server/pipeline/workflow_status.go index a99ef8ddd..12d2c15a7 100644 --- a/server/pipeline/workflow_status.go +++ b/server/pipeline/workflow_status.go @@ -15,9 +15,9 @@ package pipeline import ( - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func UpdateWorkflowStatusToRunning(store store.Store, workflow model.Workflow, state rpc.WorkflowState) (*model.Workflow, error) { diff --git a/server/queue/fifo.go b/server/queue/fifo.go index d9acc66a4..1ee07370d 100644 --- a/server/queue/fifo.go +++ b/server/queue/fifo.go @@ -23,8 +23,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) type entry struct { diff --git a/server/queue/fifo_test.go b/server/queue/fifo_test.go index 90361255d..c25d4a966 100644 --- a/server/queue/fifo_test.go +++ b/server/queue/fifo_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var ( diff --git a/server/queue/mocks/queue.go b/server/queue/mocks/queue.go index ad8686971..a851b782b 100644 --- a/server/queue/mocks/queue.go +++ b/server/queue/mocks/queue.go @@ -9,9 +9,9 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/v2/server/model" + model "go.woodpecker-ci.org/woodpecker/v3/server/model" - queue "go.woodpecker-ci.org/woodpecker/v2/server/queue" + queue "go.woodpecker-ci.org/woodpecker/v3/server/queue" ) // Queue is an autogenerated mock type for the Queue type @@ -150,7 +150,7 @@ func (_m *Queue) KickAgentWorkers(agentID int64) { _m.Called(agentID) } -// Pause provides a mock function with given fields: +// Pause provides a mock function with no fields func (_m *Queue) Pause() { _m.Called() } @@ -221,7 +221,7 @@ func (_m *Queue) PushAtOnce(c context.Context, tasks []*model.Task) error { return r0 } -// Resume provides a mock function with given fields: +// Resume provides a mock function with no fields func (_m *Queue) Resume() { _m.Called() } diff --git a/server/queue/persistent.go b/server/queue/persistent.go index e87f7c7b2..0f2ae4ae2 100644 --- a/server/queue/persistent.go +++ b/server/queue/persistent.go @@ -21,8 +21,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // WithTaskStore returns a queue that is backed by the TaskStore. This diff --git a/server/queue/queue.go b/server/queue/queue.go index cc856b6e1..e575bafcd 100644 --- a/server/queue/queue.go +++ b/server/queue/queue.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) var ( diff --git a/server/router/api.go b/server/router/api.go index 591c9a7d3..23f306aa3 100644 --- a/server/router/api.go +++ b/server/router/api.go @@ -18,10 +18,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/api" - "go.woodpecker-ci.org/woodpecker/v2/server/api/debug" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/api" + "go.woodpecker-ci.org/woodpecker/v3/server/api/debug" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) func apiRoutes(e *gin.RouterGroup) { diff --git a/server/router/middleware/session/agent.go b/server/router/middleware/session/agent.go index 0cbfa2a33..24d9bae39 100644 --- a/server/router/middleware/session/agent.go +++ b/server/router/middleware/session/agent.go @@ -20,7 +20,7 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) // AuthorizeAgent authorizes requests from agent to access the queue. diff --git a/server/router/middleware/session/org.go b/server/router/middleware/session/org.go index 0ce2af2ab..a02f0e50f 100644 --- a/server/router/middleware/session/org.go +++ b/server/router/middleware/session/org.go @@ -21,9 +21,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func Org(c *gin.Context) *model.Org { diff --git a/server/router/middleware/session/pagination.go b/server/router/middleware/session/pagination.go index 9bf4455c1..a9bffcd5f 100644 --- a/server/router/middleware/session/pagination.go +++ b/server/router/middleware/session/pagination.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const maxPageSize = 50 diff --git a/server/router/middleware/session/repo.go b/server/router/middleware/session/repo.go index 0ec3cfd65..788ae1792 100644 --- a/server/router/middleware/session/repo.go +++ b/server/router/middleware/session/repo.go @@ -24,10 +24,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func Repo(c *gin.Context) *model.Repo { diff --git a/server/router/middleware/session/user.go b/server/router/middleware/session/user.go index 862d82df6..7cc35de66 100644 --- a/server/router/middleware/session/user.go +++ b/server/router/middleware/session/user.go @@ -21,10 +21,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) func User(c *gin.Context) *model.User { diff --git a/server/router/middleware/store.go b/server/router/middleware/store.go index 6ab61167e..915b1a33c 100644 --- a/server/router/middleware/store.go +++ b/server/router/middleware/store.go @@ -17,7 +17,7 @@ package middleware import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // Store is a middleware function that initializes the Datastore and attaches to diff --git a/server/router/middleware/token/token.go b/server/router/middleware/token/token.go index 8d45adda6..600e4fb15 100644 --- a/server/router/middleware/token/token.go +++ b/server/router/middleware/token/token.go @@ -19,10 +19,10 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func Refresh(c *gin.Context) { diff --git a/server/router/middleware/version.go b/server/router/middleware/version.go index b5c8ec1e2..0fac8225a 100644 --- a/server/router/middleware/version.go +++ b/server/router/middleware/version.go @@ -17,7 +17,7 @@ package middleware import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // Version is a middleware function that appends the Woodpecker version information diff --git a/server/router/router.go b/server/router/router.go index ea154fe4a..041876d1a 100644 --- a/server/router/router.go +++ b/server/router/router.go @@ -23,14 +23,14 @@ import ( openapi_files "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" - "go.woodpecker-ci.org/woodpecker/v2/cmd/server/openapi" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/api" - "go.woodpecker-ci.org/woodpecker/v2/server/api/metrics" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/header" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/token" - "go.woodpecker-ci.org/woodpecker/v2/server/web" + "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/api" + "go.woodpecker-ci.org/woodpecker/v3/server/api/metrics" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/header" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/token" + "go.woodpecker-ci.org/woodpecker/v3/server/web" ) // Load loads the router. diff --git a/server/services/config/combined.go b/server/services/config/combined.go index 5daebb281..5a6936eb5 100644 --- a/server/services/config/combined.go +++ b/server/services/config/combined.go @@ -17,9 +17,9 @@ package config import ( "context" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) type combined struct { diff --git a/server/services/config/combined_test.go b/server/services/config/combined_test.go index 2d0910c6a..6097f9805 100644 --- a/server/services/config/combined_test.go +++ b/server/services/config/combined_test.go @@ -31,10 +31,10 @@ import ( "github.com/stretchr/testify/mock" "github.com/yaronf/httpsign" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/services/config" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/services/config" ) func TestFetchFromConfigService(t *testing.T) { diff --git a/server/services/config/forge.go b/server/services/config/forge.go index d7c5d2758..93affef73 100644 --- a/server/services/config/forge.go +++ b/server/services/config/forge.go @@ -23,10 +23,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) type forgeFetcher struct { diff --git a/server/services/config/forge_test.go b/server/services/config/forge_test.go index 43ff794c3..898d511e4 100644 --- a/server/services/config/forge_test.go +++ b/server/services/config/forge_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/services/config" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/services/config" ) func TestFetch(t *testing.T) { diff --git a/server/services/config/http.go b/server/services/config/http.go index 33dcfc756..9e6c04f8e 100644 --- a/server/services/config/http.go +++ b/server/services/config/http.go @@ -20,10 +20,10 @@ import ( "fmt" net_http "net/http" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/services/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/services/utils" ) type http struct { diff --git a/server/services/config/mocks/service.go b/server/services/config/mocks/service.go index 3f08d71c7..ca6989af1 100644 --- a/server/services/config/mocks/service.go +++ b/server/services/config/mocks/service.go @@ -6,11 +6,11 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - forge "go.woodpecker-ci.org/woodpecker/v2/server/forge" + forge "go.woodpecker-ci.org/woodpecker/v3/server/forge" - model "go.woodpecker-ci.org/woodpecker/v2/server/model" + model "go.woodpecker-ci.org/woodpecker/v3/server/model" - types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" ) // Service is an autogenerated mock type for the Service type diff --git a/server/services/config/service.go b/server/services/config/service.go index 9f857a796..b1d100d7a 100644 --- a/server/services/config/service.go +++ b/server/services/config/service.go @@ -17,9 +17,9 @@ package config import ( "context" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) //go:generate mockery --name Service --output mocks --case underscore diff --git a/server/services/encryption/aes.go b/server/services/encryption/aes.go index 1cae9dd38..00d6e3983 100644 --- a/server/services/encryption/aes.go +++ b/server/services/encryption/aes.go @@ -21,8 +21,8 @@ import ( "github.com/google/tink/go/subtle/random" - "go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) type aesEncryptionService struct { diff --git a/server/services/encryption/aes_builder.go b/server/services/encryption/aes_builder.go index bd6800e5d..e742b2e6c 100644 --- a/server/services/encryption/aes_builder.go +++ b/server/services/encryption/aes_builder.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) type aesConfiguration struct { diff --git a/server/services/encryption/aes_encryption.go b/server/services/encryption/aes_encryption.go index b7b5016ff..3eb1ce1c8 100644 --- a/server/services/encryption/aes_encryption.go +++ b/server/services/encryption/aes_encryption.go @@ -23,7 +23,7 @@ import ( "golang.org/x/crypto/bcrypt" "golang.org/x/crypto/sha3" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func (svc *aesEncryptionService) loadCipher(password string) error { diff --git a/server/services/encryption/encryption.go b/server/services/encryption/encryption.go index 4312a5ae5..a6c9ded1e 100644 --- a/server/services/encryption/encryption.go +++ b/server/services/encryption/encryption.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) type builder struct { diff --git a/server/services/encryption/encryption_builder.go b/server/services/encryption/encryption_builder.go index b59606360..2ccf14b8f 100644 --- a/server/services/encryption/encryption_builder.go +++ b/server/services/encryption/encryption_builder.go @@ -18,8 +18,8 @@ import ( "errors" "fmt" - "go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types" - storeTypes "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types" + storeTypes "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func (b builder) getService(keyType string) (types.EncryptionService, error) { diff --git a/server/services/encryption/no_encryption.go b/server/services/encryption/no_encryption.go index 6bc9230d0..dd81865ba 100644 --- a/server/services/encryption/no_encryption.go +++ b/server/services/encryption/no_encryption.go @@ -14,7 +14,7 @@ package encryption -import "go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types" +import "go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types" type noEncryptionBuilder struct { clients []types.EncryptionClient diff --git a/server/services/encryption/tink.go b/server/services/encryption/tink.go index 3c210ac7a..033315be7 100644 --- a/server/services/encryption/tink.go +++ b/server/services/encryption/tink.go @@ -21,8 +21,8 @@ import ( "github.com/fsnotify/fsnotify" "github.com/google/tink/go/tink" - "go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) type tinkEncryptionService struct { diff --git a/server/services/encryption/tink_builder.go b/server/services/encryption/tink_builder.go index ccb10cb53..6bb9457c1 100644 --- a/server/services/encryption/tink_builder.go +++ b/server/services/encryption/tink_builder.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) type tinkConfiguration struct { diff --git a/server/services/encryption/tink_keyset.go b/server/services/encryption/tink_keyset.go index aaf7b84ae..a3e7ae4b3 100644 --- a/server/services/encryption/tink_keyset.go +++ b/server/services/encryption/tink_keyset.go @@ -25,7 +25,7 @@ import ( "github.com/google/tink/go/keyset" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func (svc *tinkEncryptionService) loadKeyset() error { diff --git a/server/services/encryption/wrapper/store/secret_store.go b/server/services/encryption/wrapper/store/secret_store.go index b2ba26a38..36f58c194 100644 --- a/server/services/encryption/wrapper/store/secret_store.go +++ b/server/services/encryption/wrapper/store/secret_store.go @@ -17,7 +17,7 @@ package store import ( "fmt" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (wrapper *EncryptedSecretStore) SecretFind(repo *model.Repo, s string) (*model.Secret, error) { diff --git a/server/services/encryption/wrapper/store/secret_store_wrapper.go b/server/services/encryption/wrapper/store/secret_store_wrapper.go index e88cc51e3..92707ebc1 100644 --- a/server/services/encryption/wrapper/store/secret_store_wrapper.go +++ b/server/services/encryption/wrapper/store/secret_store_wrapper.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types" ) type EncryptedSecretStore struct { diff --git a/server/services/environment/mocks/service.go b/server/services/environment/mocks/service.go index b7cb0776d..9d85dff54 100644 --- a/server/services/environment/mocks/service.go +++ b/server/services/environment/mocks/service.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/v2/server/model" + model "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // Service is an autogenerated mock type for the Service type diff --git a/server/services/environment/parse.go b/server/services/environment/parse.go index 0a1ccb0c9..e7cbe7e74 100644 --- a/server/services/environment/parse.go +++ b/server/services/environment/parse.go @@ -19,7 +19,7 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) type builtin struct { diff --git a/server/services/environment/service.go b/server/services/environment/service.go index 0b63471fd..ac8bfff98 100644 --- a/server/services/environment/service.go +++ b/server/services/environment/service.go @@ -14,7 +14,7 @@ package environment -import "go.woodpecker-ci.org/woodpecker/v2/server/model" +import "go.woodpecker-ci.org/woodpecker/v3/server/model" //go:generate mockery --name Service --output mocks --case underscore diff --git a/server/services/log/file/file.go b/server/services/log/file/file.go index f19931beb..7a24dc5f7 100644 --- a/server/services/log/file/file.go +++ b/server/services/log/file/file.go @@ -10,9 +10,9 @@ import ( logger "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/services/log" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/services/log" ) const ( diff --git a/server/services/log/service.go b/server/services/log/service.go index da8f98146..e922b89ee 100644 --- a/server/services/log/service.go +++ b/server/services/log/service.go @@ -1,6 +1,6 @@ package log -import "go.woodpecker-ci.org/woodpecker/v2/server/model" +import "go.woodpecker-ci.org/woodpecker/v3/server/model" type Service interface { LogFind(step *model.Step) ([]*model.LogEntry, error) diff --git a/server/services/manager.go b/server/services/manager.go index e38b140e9..ca101f2bf 100644 --- a/server/services/manager.go +++ b/server/services/manager.go @@ -21,13 +21,13 @@ import ( "github.com/jellydator/ttlcache/v3" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/services/config" - "go.woodpecker-ci.org/woodpecker/v2/server/services/environment" - "go.woodpecker-ci.org/woodpecker/v2/server/services/registry" - "go.woodpecker-ci.org/woodpecker/v2/server/services/secret" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/services/config" + "go.woodpecker-ci.org/woodpecker/v3/server/services/environment" + "go.woodpecker-ci.org/woodpecker/v3/server/services/registry" + "go.woodpecker-ci.org/woodpecker/v3/server/services/secret" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) //go:generate mockery --name Manager --output mocks --case underscore --note "+build test" diff --git a/server/services/mocks/manager.go b/server/services/mocks/manager.go index 1d94cdec8..c2e071296 100644 --- a/server/services/mocks/manager.go +++ b/server/services/mocks/manager.go @@ -8,19 +8,19 @@ package mocks import ( crypto "crypto" - config "go.woodpecker-ci.org/woodpecker/v2/server/services/config" + config "go.woodpecker-ci.org/woodpecker/v3/server/services/config" - environment "go.woodpecker-ci.org/woodpecker/v2/server/services/environment" + environment "go.woodpecker-ci.org/woodpecker/v3/server/services/environment" - forge "go.woodpecker-ci.org/woodpecker/v2/server/forge" + forge "go.woodpecker-ci.org/woodpecker/v3/server/forge" mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/v2/server/model" + model "go.woodpecker-ci.org/woodpecker/v3/server/model" - registry "go.woodpecker-ci.org/woodpecker/v2/server/services/registry" + registry "go.woodpecker-ci.org/woodpecker/v3/server/services/registry" - secret "go.woodpecker-ci.org/woodpecker/v2/server/services/secret" + secret "go.woodpecker-ci.org/woodpecker/v3/server/services/secret" ) // Manager is an autogenerated mock type for the Manager type @@ -48,7 +48,7 @@ func (_m *Manager) ConfigServiceFromRepo(repo *model.Repo) config.Service { return r0 } -// EnvironmentService provides a mock function with given fields: +// EnvironmentService provides a mock function with no fields func (_m *Manager) EnvironmentService() environment.Service { ret := _m.Called() @@ -158,7 +158,7 @@ func (_m *Manager) ForgeFromUser(user *model.User) (forge.Forge, error) { return r0, r1 } -// RegistryService provides a mock function with given fields: +// RegistryService provides a mock function with no fields func (_m *Manager) RegistryService() registry.Service { ret := _m.Called() @@ -198,7 +198,7 @@ func (_m *Manager) RegistryServiceFromRepo(repo *model.Repo) registry.Service { return r0 } -// SecretService provides a mock function with given fields: +// SecretService provides a mock function with no fields func (_m *Manager) SecretService() secret.Service { ret := _m.Called() @@ -238,7 +238,7 @@ func (_m *Manager) SecretServiceFromRepo(repo *model.Repo) secret.Service { return r0 } -// SignaturePublicKey provides a mock function with given fields: +// SignaturePublicKey provides a mock function with no fields func (_m *Manager) SignaturePublicKey() crypto.PublicKey { ret := _m.Called() diff --git a/server/services/permissions/admins.go b/server/services/permissions/admins.go index cccad77c8..86bd5500a 100644 --- a/server/services/permissions/admins.go +++ b/server/services/permissions/admins.go @@ -1,8 +1,8 @@ package permissions import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func NewAdmins(admins []string) *Admins { diff --git a/server/services/permissions/admins_test.go b/server/services/permissions/admins_test.go index d1e590580..f7cbb55b9 100644 --- a/server/services/permissions/admins_test.go +++ b/server/services/permissions/admins_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestAdmins(t *testing.T) { diff --git a/server/services/permissions/orgs.go b/server/services/permissions/orgs.go index 370b6e170..312ed8ea9 100644 --- a/server/services/permissions/orgs.go +++ b/server/services/permissions/orgs.go @@ -1,8 +1,8 @@ package permissions import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func NewOrgs(orgs []string) *Orgs { diff --git a/server/services/permissions/orgs_test.go b/server/services/permissions/orgs_test.go index 431a52c96..e7ead62b6 100644 --- a/server/services/permissions/orgs_test.go +++ b/server/services/permissions/orgs_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestOrgs(t *testing.T) { diff --git a/server/services/permissions/repo_owners.go b/server/services/permissions/repo_owners.go index 2610ce8a3..07db15a1e 100644 --- a/server/services/permissions/repo_owners.go +++ b/server/services/permissions/repo_owners.go @@ -1,8 +1,8 @@ package permissions import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func NewOwnersAllowlist(owners []string) *OwnersAllowlist { diff --git a/server/services/permissions/repo_owners_test.go b/server/services/permissions/repo_owners_test.go index c34821255..77206eb79 100644 --- a/server/services/permissions/repo_owners_test.go +++ b/server/services/permissions/repo_owners_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestOwnersAllowlist(t *testing.T) { diff --git a/server/services/registry/combined.go b/server/services/registry/combined.go index bdb249bcd..0cb551156 100644 --- a/server/services/registry/combined.go +++ b/server/services/registry/combined.go @@ -17,8 +17,8 @@ package registry import ( "errors" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) type combined struct { diff --git a/server/services/registry/db.go b/server/services/registry/db.go index 6e566d27c..efdb2c8c4 100644 --- a/server/services/registry/db.go +++ b/server/services/registry/db.go @@ -15,8 +15,8 @@ package registry import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) type db struct { diff --git a/server/services/registry/filesystem.go b/server/services/registry/filesystem.go index 959c69834..cfcb0c883 100644 --- a/server/services/registry/filesystem.go +++ b/server/services/registry/filesystem.go @@ -24,8 +24,8 @@ import ( config_file "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - model_types "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + model_types "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) type filesystem struct { diff --git a/server/services/registry/mocks/service.go b/server/services/registry/mocks/service.go index ecce0a414..49cf1e8e2 100644 --- a/server/services/registry/mocks/service.go +++ b/server/services/registry/mocks/service.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/v2/server/model" + model "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // Service is an autogenerated mock type for the Service type diff --git a/server/services/registry/service.go b/server/services/registry/service.go index 39e1e3fa9..a2fc03979 100644 --- a/server/services/registry/service.go +++ b/server/services/registry/service.go @@ -14,7 +14,7 @@ package registry -import "go.woodpecker-ci.org/woodpecker/v2/server/model" +import "go.woodpecker-ci.org/woodpecker/v3/server/model" //go:generate mockery --name Service --output mocks --case underscore diff --git a/server/services/secret/db.go b/server/services/secret/db.go index 52231ca9e..25e779e3d 100644 --- a/server/services/secret/db.go +++ b/server/services/secret/db.go @@ -15,8 +15,8 @@ package secret import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) type db struct { diff --git a/server/services/secret/db_test.go b/server/services/secret/db_test.go index cd1112373..08e1a5f16 100644 --- a/server/services/secret/db_test.go +++ b/server/services/secret/db_test.go @@ -20,9 +20,9 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/services/secret" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/services/secret" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" ) func TestSecretListPipeline(t *testing.T) { diff --git a/server/services/secret/mocks/service.go b/server/services/secret/mocks/service.go index 37f301d53..d918d625b 100644 --- a/server/services/secret/mocks/service.go +++ b/server/services/secret/mocks/service.go @@ -4,7 +4,7 @@ package mocks import ( mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/v2/server/model" + model "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // Service is an autogenerated mock type for the Service type diff --git a/server/services/secret/service.go b/server/services/secret/service.go index c2b25ba0f..8bc691d2e 100644 --- a/server/services/secret/service.go +++ b/server/services/secret/service.go @@ -14,7 +14,7 @@ package secret -import "go.woodpecker-ci.org/woodpecker/v2/server/model" +import "go.woodpecker-ci.org/woodpecker/v3/server/model" //go:generate mockery --name Service --output mocks --case underscore diff --git a/server/services/setup.go b/server/services/setup.go index 751a30ddd..dca0c4195 100644 --- a/server/services/setup.go +++ b/server/services/setup.go @@ -26,12 +26,12 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/services/config" - "go.woodpecker-ci.org/woodpecker/v2/server/services/registry" - "go.woodpecker-ci.org/woodpecker/v2/server/services/secret" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/services/config" + "go.woodpecker-ci.org/woodpecker/v3/server/services/registry" + "go.woodpecker-ci.org/woodpecker/v3/server/services/secret" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func setupRegistryService(store store.Store, dockerConfig string) registry.Service { diff --git a/server/store/datastore/agent.go b/server/store/datastore/agent.go index 18e035e76..d3289abd9 100644 --- a/server/store/datastore/agent.go +++ b/server/store/datastore/agent.go @@ -17,7 +17,7 @@ package datastore import ( "errors" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var ErrNoTokenProvided = errors.New("please provide a token") diff --git a/server/store/datastore/agent_test.go b/server/store/datastore/agent_test.go index c94d46719..71495b460 100644 --- a/server/store/datastore/agent_test.go +++ b/server/store/datastore/agent_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestAgentFindByToken(t *testing.T) { diff --git a/server/store/datastore/config.go b/server/store/datastore/config.go index b16c415a8..765d5ed86 100644 --- a/server/store/datastore/config.go +++ b/server/store/datastore/config.go @@ -22,8 +22,8 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func (s storage) ConfigsForPipeline(pipelineID int64) ([]*model.Config, error) { diff --git a/server/store/datastore/config_test.go b/server/store/datastore/config_test.go index a08c789df..81a0114d0 100644 --- a/server/store/datastore/config_test.go +++ b/server/store/datastore/config_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var ( diff --git a/server/store/datastore/cron.go b/server/store/datastore/cron.go index 89cf91e3e..e790c74c9 100644 --- a/server/store/datastore/cron.go +++ b/server/store/datastore/cron.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) CronCreate(cron *model.Cron) error { diff --git a/server/store/datastore/cron_test.go b/server/store/datastore/cron_test.go index 28d9a7a59..88710f91f 100644 --- a/server/store/datastore/cron_test.go +++ b/server/store/datastore/cron_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestCronCreate(t *testing.T) { diff --git a/server/store/datastore/engine.go b/server/store/datastore/engine.go index 316347591..e7494b484 100644 --- a/server/store/datastore/engine.go +++ b/server/store/datastore/engine.go @@ -21,8 +21,8 @@ import ( "xorm.io/xorm" xlog "xorm.io/xorm/log" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/datastore/migration" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/datastore/migration" ) type storage struct { diff --git a/server/store/datastore/errors.go b/server/store/datastore/errors.go index a7d89388a..c2668e8aa 100644 --- a/server/store/datastore/errors.go +++ b/server/store/datastore/errors.go @@ -17,7 +17,7 @@ package datastore import ( "fmt" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) type ErrorRepoNotExist struct { diff --git a/server/store/datastore/feed.go b/server/store/datastore/feed.go index d06897bf8..8be597f05 100644 --- a/server/store/datastore/feed.go +++ b/server/store/datastore/feed.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var feedItemSelect = `repos.id as repo_id, diff --git a/server/store/datastore/feed_test.go b/server/store/datastore/feed_test.go index fb4b0e52f..d8adb8c53 100644 --- a/server/store/datastore/feed_test.go +++ b/server/store/datastore/feed_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestGetPipelineQueue(t *testing.T) { diff --git a/server/store/datastore/forge.go b/server/store/datastore/forge.go index 5c1a29efc..8e30bd974 100644 --- a/server/store/datastore/forge.go +++ b/server/store/datastore/forge.go @@ -15,7 +15,7 @@ package datastore import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) ForgeGet(id int64) (*model.Forge, error) { diff --git a/server/store/datastore/forge_test.go b/server/store/datastore/forge_test.go index a7583d8db..1f163bf08 100644 --- a/server/store/datastore/forge_test.go +++ b/server/store/datastore/forge_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestForgeCRUD(t *testing.T) { diff --git a/server/store/datastore/helper.go b/server/store/datastore/helper.go index 4ba698b88..4f2c2650a 100644 --- a/server/store/datastore/helper.go +++ b/server/store/datastore/helper.go @@ -21,8 +21,8 @@ import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) // wrapGet return error if err not nil or if requested entry do not exist. diff --git a/server/store/datastore/helper_test.go b/server/store/datastore/helper_test.go index be8b835e6..c694d46bf 100644 --- a/server/store/datastore/helper_test.go +++ b/server/store/datastore/helper_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func TestWrapGet(t *testing.T) { diff --git a/server/store/datastore/log.go b/server/store/datastore/log.go index 3aedf4650..ade01c08c 100644 --- a/server/store/datastore/log.go +++ b/server/store/datastore/log.go @@ -16,8 +16,9 @@ package datastore import ( "github.com/rs/zerolog/log" + "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // Maximum number of records to store in one PostgreSQL statement. @@ -46,6 +47,12 @@ func (s storage) LogAppend(_ *model.Step, logEntries []*model.LogEntry) error { } func (s storage) LogDelete(step *model.Step) error { - _, err := s.engine.Where("step_id = ?", step.ID).Delete(new(model.LogEntry)) + sess := s.engine.NewSession() + defer sess.Close() + return logDelete(sess, step.ID) +} + +func logDelete(sess *xorm.Session, stepID int64) error { + _, err := sess.Where("step_id = ?", stepID).Delete(new(model.LogEntry)) return err } diff --git a/server/store/datastore/log_test.go b/server/store/datastore/log_test.go index 94897268c..1c331ff78 100644 --- a/server/store/datastore/log_test.go +++ b/server/store/datastore/log_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestLogCreateFindDelete(t *testing.T) { diff --git a/server/store/datastore/migration/008_set_default_forge_id.go b/server/store/datastore/migration/008_set_default_forge_id.go index d430dbda2..5387a8ae0 100644 --- a/server/store/datastore/migration/008_set_default_forge_id.go +++ b/server/store/datastore/migration/008_set_default_forge_id.go @@ -20,7 +20,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) type userV008 struct { @@ -56,7 +56,6 @@ type repoV008 struct { Clone string `xorm:"varchar(1000) 'repo_clone'"` CloneSSH string `xorm:"varchar(1000) 'repo_clone_ssh'"` Branch string `xorm:"varchar(500) 'repo_branch'"` - SCMKind model.SCMKind `xorm:"varchar(50) 'repo_scm'"` PREnabled bool `xorm:"DEFAULT TRUE 'repo_pr_enabled'"` Timeout int64 `xorm:"repo_timeout"` Visibility model.RepoVisibility `xorm:"varchar(10) 'repo_visibility'"` diff --git a/server/store/datastore/migration/011_cron_without_sec.go b/server/store/datastore/migration/011_cron_without_sec.go index 12e5b257f..c99290259 100644 --- a/server/store/datastore/migration/011_cron_without_sec.go +++ b/server/store/datastore/migration/011_cron_without_sec.go @@ -21,7 +21,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var cronWithoutSec = xormigrate.Migration{ diff --git a/server/store/datastore/migration/015_add_org_agents.go b/server/store/datastore/migration/015_add_org_agents.go index 83348f32c..045ce980e 100644 --- a/server/store/datastore/migration/015_add_org_agents.go +++ b/server/store/datastore/migration/015_add_org_agents.go @@ -20,7 +20,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var addOrgAgents = xormigrate.Migration{ diff --git a/server/store/datastore/migration/017_split_trusted.go b/server/store/datastore/migration/017_split_trusted.go index e7ea7b8d5..a03fa86c2 100644 --- a/server/store/datastore/migration/017_split_trusted.go +++ b/server/store/datastore/migration/017_split_trusted.go @@ -20,7 +20,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var splitTrusted = xormigrate.Migration{ diff --git a/server/store/datastore/migration/023_remove_repo_scm.go b/server/store/datastore/migration/023_remove_repo_scm.go new file mode 100644 index 000000000..196d4f9c9 --- /dev/null +++ b/server/store/datastore/migration/023_remove_repo_scm.go @@ -0,0 +1,36 @@ +// Copyright 2024 Woodpecker Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package migration + +import ( + "src.techknowlogick.com/xormigrate" + "xorm.io/xorm" +) + +var removeRepoScm = xormigrate.Migration{ + ID: "remove-repo-scm", + MigrateSession: func(sess *xorm.Session) (err error) { + type repos struct { + SCMKind string `xorm:"varchar(50) 'scm'"` + } + + // ensure columns to drop exist + if err := sess.Sync(new(repos)); err != nil { + return err + } + + return dropTableColumns(sess, "repos", "scm") + }, +} diff --git a/server/store/datastore/migration/migration.go b/server/store/datastore/migration/migration.go index df0cd8280..d056aad56 100644 --- a/server/store/datastore/migration/migration.go +++ b/server/store/datastore/migration/migration.go @@ -22,7 +22,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // APPEND NEW MIGRATIONS @@ -51,6 +51,7 @@ var migrationTasks = []*xormigrate.Migration{ &removeRepoNetrcOnlyTrusted, &renameTokenFields, &setNewDefaultsForRequireApproval, + &removeRepoScm, } var allBeans = []any{ diff --git a/server/store/datastore/org.go b/server/store/datastore/org.go index b432fb65c..eb18ac8df 100644 --- a/server/store/datastore/org.go +++ b/server/store/datastore/org.go @@ -20,7 +20,7 @@ import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) OrgCreate(org *model.Org) error { diff --git a/server/store/datastore/org_test.go b/server/store/datastore/org_test.go index a2a06f868..5136708f5 100644 --- a/server/store/datastore/org_test.go +++ b/server/store/datastore/org_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestOrgCRUD(t *testing.T) { diff --git a/server/store/datastore/permission.go b/server/store/datastore/permission.go index 22736fdc3..63a6e3dc6 100644 --- a/server/store/datastore/permission.go +++ b/server/store/datastore/permission.go @@ -20,7 +20,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) PermFind(user *model.User, repo *model.Repo) (*model.Perm, error) { diff --git a/server/store/datastore/permission_test.go b/server/store/datastore/permission_test.go index 2e7e8107a..45882c7c2 100644 --- a/server/store/datastore/permission_test.go +++ b/server/store/datastore/permission_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestPermFind(t *testing.T) { diff --git a/server/store/datastore/pipeline.go b/server/store/datastore/pipeline.go index 9a32bf482..14eff95c8 100644 --- a/server/store/datastore/pipeline.go +++ b/server/store/datastore/pipeline.go @@ -20,7 +20,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) GetPipeline(id int64) (*model.Pipeline, error) { @@ -35,6 +35,15 @@ func (s storage) GetPipelineNumber(repo *model.Repo, num int64) (*model.Pipeline ).Get(pipeline)) } +func (s storage) GetPipelineBadge(repo *model.Repo, branch string) (*model.Pipeline, error) { + pipeline := new(model.Pipeline) + return pipeline, wrapGet(s.engine. + Desc("number"). + Where(builder.Eq{"repo_id": repo.ID, "branch": branch, "event": model.EventPush}). + Where(builder.Neq{"status": model.StatusBlocked}). + Get(pipeline)) +} + func (s storage) GetPipelineLast(repo *model.Repo, branch string) (*model.Pipeline, error) { pipeline := new(model.Pipeline) return pipeline, wrapGet(s.engine. diff --git a/server/store/datastore/pipeline_test.go b/server/store/datastore/pipeline_test.go index 3382faf73..c4a81c632 100644 --- a/server/store/datastore/pipeline_test.go +++ b/server/store/datastore/pipeline_test.go @@ -23,8 +23,8 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func TestPipelines(t *testing.T) { diff --git a/server/store/datastore/redirection.go b/server/store/datastore/redirection.go index f9dd1a34a..637c36d65 100644 --- a/server/store/datastore/redirection.go +++ b/server/store/datastore/redirection.go @@ -18,7 +18,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) getRedirection(e *xorm.Session, fullName string) (*model.Redirection, error) { diff --git a/server/store/datastore/redirection_test.go b/server/store/datastore/redirection_test.go index 8e72cd048..ba59c6a24 100644 --- a/server/store/datastore/redirection_test.go +++ b/server/store/datastore/redirection_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestCreateRedirection(t *testing.T) { diff --git a/server/store/datastore/registry.go b/server/store/datastore/registry.go index 49687783e..e1ba9368a 100644 --- a/server/store/datastore/registry.go +++ b/server/store/datastore/registry.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const orderRegistriesBy = "id" diff --git a/server/store/datastore/registry_test.go b/server/store/datastore/registry_test.go index e6f3f5f05..a1cbfa0d8 100644 --- a/server/store/datastore/registry_test.go +++ b/server/store/datastore/registry_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func TestRegistryFind(t *testing.T) { diff --git a/server/store/datastore/repo.go b/server/store/datastore/repo.go index f373b17cd..559591bd4 100644 --- a/server/store/datastore/repo.go +++ b/server/store/datastore/repo.go @@ -22,8 +22,8 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func (s storage) GetRepo(id int64) (*model.Repo, error) { diff --git a/server/store/datastore/repo_test.go b/server/store/datastore/repo_test.go index aabd31afa..90b5dfac4 100644 --- a/server/store/datastore/repo_test.go +++ b/server/store/datastore/repo_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestRepos(t *testing.T) { diff --git a/server/store/datastore/secret.go b/server/store/datastore/secret.go index 9a481ab1b..0b508c85b 100644 --- a/server/store/datastore/secret.go +++ b/server/store/datastore/secret.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const orderSecretsBy = "name" diff --git a/server/store/datastore/secret_test.go b/server/store/datastore/secret_test.go index 88171ea9c..d96438660 100644 --- a/server/store/datastore/secret_test.go +++ b/server/store/datastore/secret_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestSecretFind(t *testing.T) { diff --git a/server/store/datastore/server_config.go b/server/store/datastore/server_config.go index a18517edb..c1985deb5 100644 --- a/server/store/datastore/server_config.go +++ b/server/store/datastore/server_config.go @@ -14,7 +14,7 @@ package datastore -import "go.woodpecker-ci.org/woodpecker/v2/server/model" +import "go.woodpecker-ci.org/woodpecker/v3/server/model" func (s storage) ServerConfigGet(key string) (string, error) { config := new(model.ServerConfig) diff --git a/server/store/datastore/server_config_test.go b/server/store/datastore/server_config_test.go index dbbeddde9..f37ef4c68 100644 --- a/server/store/datastore/server_config_test.go +++ b/server/store/datastore/server_config_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestServerConfigGetSet(t *testing.T) { diff --git a/server/store/datastore/step.go b/server/store/datastore/step.go index 3a4a43b80..6f81bea11 100644 --- a/server/store/datastore/step.go +++ b/server/store/datastore/step.go @@ -18,7 +18,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) StepLoad(id int64) (*model.Step, error) { @@ -84,7 +84,7 @@ func (s storage) StepUpdate(step *model.Step) error { } func deleteStep(sess *xorm.Session, stepID int64) error { - if _, err := sess.Where("id = ?", stepID).Delete(new(model.LogEntry)); err != nil { + if err := logDelete(sess, stepID); err != nil { return err } return wrapDelete(sess.ID(stepID).Delete(new(model.Step))) diff --git a/server/store/datastore/step_test.go b/server/store/datastore/step_test.go index 74840d2e2..95d7bba88 100644 --- a/server/store/datastore/step_test.go +++ b/server/store/datastore/step_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func TestStepFind(t *testing.T) { diff --git a/server/store/datastore/task.go b/server/store/datastore/task.go index 44296dff1..40f95963b 100644 --- a/server/store/datastore/task.go +++ b/server/store/datastore/task.go @@ -15,7 +15,7 @@ package datastore import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) TaskList() ([]*model.Task, error) { diff --git a/server/store/datastore/task_test.go b/server/store/datastore/task_test.go index 61e16bb81..c32ae191b 100644 --- a/server/store/datastore/task_test.go +++ b/server/store/datastore/task_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestTaskList(t *testing.T) { diff --git a/server/store/datastore/user.go b/server/store/datastore/user.go index c1900062e..aa3d35f7d 100644 --- a/server/store/datastore/user.go +++ b/server/store/datastore/user.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) GetUser(id int64) (*model.User, error) { diff --git a/server/store/datastore/users_test.go b/server/store/datastore/users_test.go index 04016af1c..a26ebecca 100644 --- a/server/store/datastore/users_test.go +++ b/server/store/datastore/users_test.go @@ -20,7 +20,7 @@ import ( "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestUsers(t *testing.T) { diff --git a/server/store/datastore/workflow.go b/server/store/datastore/workflow.go index 8e76df90c..714c7a674 100644 --- a/server/store/datastore/workflow.go +++ b/server/store/datastore/workflow.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) WorkflowGetTree(pipeline *model.Pipeline) ([]*model.Workflow, error) { diff --git a/server/store/datastore/workflow_test.go b/server/store/datastore/workflow_test.go index b0a6e2b68..5a31646a2 100644 --- a/server/store/datastore/workflow_test.go +++ b/server/store/datastore/workflow_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestWorkflowLoad(t *testing.T) { diff --git a/server/store/mocks/store.go b/server/store/mocks/store.go index 3b778395c..a35d8a655 100644 --- a/server/store/mocks/store.go +++ b/server/store/mocks/store.go @@ -9,7 +9,7 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/v2/server/model" + model "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // Store is an autogenerated mock type for the Store type @@ -191,7 +191,7 @@ func (_m *Store) AgentUpdate(_a0 *model.Agent) error { return r0 } -// Close provides a mock function with given fields: +// Close provides a mock function with no fields func (_m *Store) Close() error { ret := _m.Called() @@ -748,7 +748,37 @@ func (_m *Store) GetPipeline(_a0 int64) (*model.Pipeline, error) { return r0, r1 } -// GetPipelineCount provides a mock function with given fields: +// GetPipelineBadge provides a mock function with given fields: _a0, _a1 +func (_m *Store) GetPipelineBadge(_a0 *model.Repo, _a1 string) (*model.Pipeline, error) { + ret := _m.Called(_a0, _a1) + + if len(ret) == 0 { + panic("no return value specified for GetPipelineBadge") + } + + var r0 *model.Pipeline + var r1 error + if rf, ok := ret.Get(0).(func(*model.Repo, string) (*model.Pipeline, error)); ok { + return rf(_a0, _a1) + } + if rf, ok := ret.Get(0).(func(*model.Repo, string) *model.Pipeline); ok { + r0 = rf(_a0, _a1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*model.Pipeline) + } + } + + if rf, ok := ret.Get(1).(func(*model.Repo, string) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// GetPipelineCount provides a mock function with no fields func (_m *Store) GetPipelineCount() (int64, error) { ret := _m.Called() @@ -896,7 +926,7 @@ func (_m *Store) GetPipelineNumber(_a0 *model.Repo, _a1 int64) (*model.Pipeline, return r0, r1 } -// GetPipelineQueue provides a mock function with given fields: +// GetPipelineQueue provides a mock function with no fields func (_m *Store) GetPipelineQueue() ([]*model.Feed, error) { ret := _m.Called() @@ -956,7 +986,7 @@ func (_m *Store) GetRepo(_a0 int64) (*model.Repo, error) { return r0, r1 } -// GetRepoCount provides a mock function with given fields: +// GetRepoCount provides a mock function with no fields func (_m *Store) GetRepoCount() (int64, error) { ret := _m.Called() @@ -1104,7 +1134,7 @@ func (_m *Store) GetUser(_a0 int64) (*model.User, error) { return r0, r1 } -// GetUserCount provides a mock function with given fields: +// GetUserCount provides a mock function with no fields func (_m *Store) GetUserCount() (int64, error) { ret := _m.Called() @@ -1796,7 +1826,7 @@ func (_m *Store) PermUpsert(perm *model.Perm) error { return r0 } -// Ping provides a mock function with given fields: +// Ping provides a mock function with no fields func (_m *Store) Ping() error { ret := _m.Called() @@ -1928,7 +1958,7 @@ func (_m *Store) RegistryList(_a0 *model.Repo, _a1 bool, _a2 *model.ListOptions) return r0, r1 } -// RegistryListAll provides a mock function with given fields: +// RegistryListAll provides a mock function with no fields func (_m *Store) RegistryListAll() ([]*model.Registry, error) { ret := _m.Called() @@ -2162,7 +2192,7 @@ func (_m *Store) SecretList(_a0 *model.Repo, _a1 bool, _a2 *model.ListOptions) ( return r0, r1 } -// SecretListAll provides a mock function with given fields: +// SecretListAll provides a mock function with no fields func (_m *Store) SecretListAll() ([]*model.Secret, error) { ret := _m.Called() @@ -2508,7 +2538,7 @@ func (_m *Store) TaskInsert(_a0 *model.Task) error { return r0 } -// TaskList provides a mock function with given fields: +// TaskList provides a mock function with no fields func (_m *Store) TaskList() ([]*model.Task, error) { ret := _m.Called() diff --git a/server/store/store.go b/server/store/store.go index a3503e386..18a6f766a 100644 --- a/server/store/store.go +++ b/server/store/store.go @@ -19,7 +19,7 @@ package store import ( "context" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // TODO: CreateX func should return new object to not indirect let storage change an existing object (alter ID etc...) @@ -72,6 +72,8 @@ type Store interface { GetPipeline(int64) (*model.Pipeline, error) // GetPipelineNumber gets a pipeline by number. GetPipelineNumber(*model.Repo, int64) (*model.Pipeline, error) + // GetPipelineBadge gets the last relevant pipeline for the badge. + GetPipelineBadge(*model.Repo, string) (*model.Pipeline, error) // GetPipelineLast gets the last pipeline for the branch. GetPipelineLast(*model.Repo, string) (*model.Pipeline, error) // GetPipelineLastBefore gets the last pipeline before pipeline number N. diff --git a/server/web/config.go b/server/web/config.go index 2d204d277..48fed96ea 100644 --- a/server/web/config.go +++ b/server/web/config.go @@ -23,10 +23,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/version" ) func Config(c *gin.Context) { diff --git a/server/web/web.go b/server/web/web.go index f827ab60e..68a7be487 100644 --- a/server/web/web.go +++ b/server/web/web.go @@ -27,8 +27,8 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/web" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/web" ) var indexHTML []byte diff --git a/server/web/web_test.go b/server/web/web_test.go index 52e7b255e..c23c704d1 100644 --- a/server/web/web_test.go +++ b/server/web/web_test.go @@ -23,7 +23,7 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v3/server" ) func Test_custom_file_returns_OK_and_empty_content_and_fitting_mimetype(t *testing.T) { diff --git a/shared/token/token_test.go b/shared/token/token_test.go index fb77ef609..5c321e4d9 100644 --- a/shared/token/token_test.go +++ b/shared/token/token_test.go @@ -8,7 +8,7 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) func TestToken(t *testing.T) { diff --git a/web/package.json b/web/package.json index 874f81d49..9bd4e7a92 100644 --- a/web/package.json +++ b/web/package.json @@ -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": "^14.0.0", + "vue": "^3.5.13", + "vue-i18n": "^11.0.0", + "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": { diff --git a/web/pnpm-lock.yaml b/web/pnpm-lock.yaml index 399030069..1fe2cfe8f 100644 --- a/web/pnpm-lock.yaml +++ b/web/pnpm-lock.yaml @@ -11,24 +11,21 @@ importers: .: dependencies: - '@intlify/unplugin-vue-i18n': - specifier: ^6.0.0 - version: 6.0.0(@vue/compiler-dom@3.5.13)(eslint@9.16.0(jiti@1.21.6))(rollup@4.28.0)(typescript@5.6.3)(vue-i18n@10.0.5(vue@3.5.13(typescript@5.6.3)))(vue@3.5.13(typescript@5.6.3)) '@kyvg/vue3-notification': - specifier: ^3.2.1 - version: 3.4.1(vue@3.5.13(typescript@5.6.3)) + specifier: ^3.4.1 + version: 3.4.1(vue@3.5.13(typescript@5.7.2)) '@mdi/js': specifier: ^7.4.47 version: 7.4.47 '@vueuse/core': - specifier: ^12.0.0 - version: 12.0.0(typescript@5.6.3) + specifier: ^12.2.0 + version: 12.2.0(typescript@5.7.2) ansi_up: specifier: ^6.0.2 version: 6.0.2 dompurify: - specifier: ^3.2.0 - version: 3.2.2 + specifier: ^3.2.3 + version: 3.2.3 fuse.js: specifier: ^7.0.0 version: 7.0.0 @@ -39,14 +36,14 @@ importers: specifier: ^4.17.21 version: 4.17.21 marked: - specifier: ^15.0.0 - version: 15.0.3 + specifier: ^15.0.4 + version: 15.0.4 node-emoji: - specifier: ^2.1.3 - version: 2.1.3 + specifier: ^2.2.0 + version: 2.2.0 pinia: - specifier: ^2.2.1 - version: 2.2.8(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)) + specifier: ^2.3.0 + version: 2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)) prismjs: specifier: ^1.29.0 version: 1.29.0 @@ -54,41 +51,44 @@ importers: specifier: ^7.6.3 version: 7.6.3 simple-icons: - specifier: ^13.5.0 - version: 13.19.0 + specifier: ^14.0.0 + version: 14.0.0 vue: - specifier: ^3.4.38 - version: 3.5.13(typescript@5.6.3) + specifier: ^3.5.13 + version: 3.5.13(typescript@5.7.2) vue-i18n: - specifier: ^10.0.3 - version: 10.0.5(vue@3.5.13(typescript@5.6.3)) + specifier: ^11.0.0 + version: 11.0.1(vue@3.5.13(typescript@5.7.2)) vue-router: - specifier: ^4.4.3 - version: 4.5.0(vue@3.5.13(typescript@5.6.3)) + specifier: ^4.5.0 + version: 4.5.0(vue@3.5.13(typescript@5.7.2)) devDependencies: '@antfu/eslint-config': - specifier: ^3.3.2 - version: 3.11.2(@typescript-eslint/utils@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(@vue/compiler-sfc@3.5.13)(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3)(vitest@2.1.6(@types/node@22.10.1)(jiti@1.21.6)(jsdom@25.0.1)(stylus@0.57.0)(yaml@2.6.1)) + specifier: ^3.12.1 + version: 3.12.1(@typescript-eslint/utils@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(@vue/compiler-sfc@3.5.13)(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2)(vitest@2.1.8(@types/node@22.10.2)(jsdom@25.0.1)(stylus@0.57.0)) '@eslint/js': - specifier: ^9.9.0 - version: 9.16.0 + specifier: ^9.17.0 + version: 9.17.0 '@ianvs/prettier-plugin-sort-imports': - specifier: ^4.3.1 - version: 4.4.0(@vue/compiler-sfc@3.5.13)(prettier@3.4.1) + specifier: ^4.4.0 + version: 4.4.0(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) '@intlify/eslint-plugin-vue-i18n': - specifier: 3.1.0 - version: 3.1.0(eslint@9.16.0(jiti@1.21.6)) + specifier: 3.2.0 + version: 3.2.0(eslint@9.17.0(jiti@1.21.7)) + '@intlify/unplugin-vue-i18n': + specifier: ^6.0.2 + version: 6.0.2(@vue/compiler-dom@3.5.13)(eslint@9.17.0(jiti@1.21.7))(rollup@4.29.1)(typescript@5.7.2)(vue-i18n@11.0.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2)) '@types/eslint__js': specifier: ^8.42.3 version: 8.42.3 '@types/lodash': - specifier: ^4.17.7 + specifier: ^4.17.13 version: 4.17.13 '@types/node': - specifier: ^22.0.0 - version: 22.10.1 + specifier: ^22.10.2 + version: 22.10.2 '@types/prismjs': - specifier: ^1.26.4 + specifier: ^1.26.5 version: 1.26.5 '@types/semver': specifier: ^7.5.8 @@ -97,53 +97,53 @@ importers: specifier: ^1.4.6 version: 1.4.6 '@vitejs/plugin-vue': - specifier: ^5.1.2 - version: 5.2.1(vite@6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1))(vue@3.5.13(typescript@5.6.3)) + specifier: ^5.2.1 + version: 5.2.1(vite@6.0.6(@types/node@22.10.2)(jiti@1.21.7)(stylus@0.57.0)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.2)) '@vue/compiler-sfc': - specifier: ^3.4.38 + specifier: ^3.5.13 version: 3.5.13 '@vue/test-utils': specifier: ^2.4.6 version: 2.4.6 eslint: - specifier: ^9.9.0 - version: 9.16.0(jiti@1.21.6) + specifier: ^9.17.0 + version: 9.17.0(jiti@1.21.7) eslint-plugin-promise: - specifier: ^7.1.0 - version: 7.2.1(eslint@9.16.0(jiti@1.21.6)) + specifier: ^7.2.1 + version: 7.2.1(eslint@9.17.0(jiti@1.21.7)) eslint-plugin-vue-scoped-css: - specifier: ^2.8.1 - version: 2.9.0(eslint@9.16.0(jiti@1.21.6))(vue-eslint-parser@9.4.3(eslint@9.16.0(jiti@1.21.6))) + specifier: ^2.9.0 + version: 2.9.0(eslint@9.17.0(jiti@1.21.7))(vue-eslint-parser@9.4.3(eslint@9.17.0(jiti@1.21.7))) jsdom: - specifier: ^25.0.0 + specifier: ^25.0.1 version: 25.0.1 prettier: - specifier: ^3.3.3 - version: 3.4.1 + specifier: ^3.4.2 + version: 3.4.2 tinycolor2: specifier: ^1.6.0 version: 1.6.0 typescript: - specifier: 5.6.3 - version: 5.6.3 + specifier: 5.7.2 + version: 5.7.2 vite: - specifier: ^6.0.0 - version: 6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1) + specifier: ^6.0.5 + version: 6.0.6(@types/node@22.10.2)(jiti@1.21.7)(stylus@0.57.0)(yaml@2.6.1) vite-plugin-prismjs: specifier: ^0.0.11 version: 0.0.11(prismjs@1.29.0) vite-plugin-windicss: - specifier: ^1.9.3 - version: 1.9.4(vite@6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1)) + specifier: ^1.9.4 + version: 1.9.4(vite@6.0.6(@types/node@22.10.2)(jiti@1.21.7)(stylus@0.57.0)(yaml@2.6.1)) vite-svg-loader: specifier: ^5.1.0 - version: 5.1.0(vue@3.5.13(typescript@5.6.3)) + version: 5.1.0(vue@3.5.13(typescript@5.7.2)) vitest: - specifier: ^2.0.5 - version: 2.1.6(@types/node@22.10.1)(jiti@1.21.6)(jsdom@25.0.1)(stylus@0.57.0)(yaml@2.6.1) + specifier: ^2.1.8 + version: 2.1.8(@types/node@22.10.2)(jsdom@25.0.1)(stylus@0.57.0) vue-tsc: - specifier: ^2.0.29 - version: 2.1.10(typescript@5.6.3) + specifier: ^2.2.0 + version: 2.2.0(typescript@5.7.2) windicss: specifier: ^3.5.6 version: 3.5.6 @@ -154,11 +154,11 @@ packages: resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} - '@antfu/eslint-config@3.11.2': - resolution: {integrity: sha512-hoi2MnOdiKL8mIhpMtinwMrqVPq6QVbHPA+BuQD4pqE6yVLyYvjdLFiKApMsezAM+YofCsbhak2oY+JCiIyeNA==} + '@antfu/eslint-config@3.12.1': + resolution: {integrity: sha512-6sRgO4u63GK75xeZ2MfCSRT9GcfLti4ZN3Xw+bIu39oo6HY50fBY+rXnWvgwNimzHBOh3yV5xUHfTqcHq1M5AA==} hasBin: true peerDependencies: - '@eslint-react/eslint-plugin': ^1.5.8 + '@eslint-react/eslint-plugin': ^1.19.0 '@prettier/plugin-xml': ^3.4.1 '@unocss/eslint-plugin': '>=0.50.0' astro-eslint-parser: ^1.0.2 @@ -210,16 +210,16 @@ packages: resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==} engines: {node: '>=6.9.0'} - '@babel/compat-data@7.26.2': - resolution: {integrity: sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==} + '@babel/compat-data@7.26.3': + resolution: {integrity: sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==} engines: {node: '>=6.9.0'} '@babel/core@7.26.0': resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==} engines: {node: '>=6.9.0'} - '@babel/generator@7.26.2': - resolution: {integrity: sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==} + '@babel/generator@7.26.3': + resolution: {integrity: sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==} engines: {node: '>=6.9.0'} '@babel/helper-compilation-targets@7.25.9': @@ -252,8 +252,8 @@ packages: resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==} engines: {node: '>=6.9.0'} - '@babel/parser@7.26.2': - resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==} + '@babel/parser@7.26.3': + resolution: {integrity: sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==} engines: {node: '>=6.0.0'} hasBin: true @@ -265,168 +265,308 @@ packages: resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==} engines: {node: '>=6.9.0'} - '@babel/traverse@7.25.9': - resolution: {integrity: sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==} + '@babel/traverse@7.26.4': + resolution: {integrity: sha512-fH+b7Y4p3yqvApJALCPJcwb0/XaOSgtK4pzV6WVjPR5GLFQBRI7pfoX2V2iM48NXvX07NUxxm1Vw98YjqTcU5w==} engines: {node: '>=6.9.0'} - '@babel/types@7.26.0': - resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==} + '@babel/types@7.26.3': + resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==} engines: {node: '>=6.9.0'} - '@clack/core@0.3.5': - resolution: {integrity: sha512-5cfhQNH+1VQ2xLQlmzXMqUoiaH0lRBq9/CLW9lTyMbuKLC3+xEK01tHVvyut++mLOn5urSHmkm6I0Lg9MaJSTQ==} + '@clack/core@0.4.0': + resolution: {integrity: sha512-YJCYBsyJfNDaTbvDUVSJ3SgSuPrcujarRgkJ5NLjexDZKvaOiVVJvAQYx8lIgG0qRT8ff0fPgqyBCVivanIZ+A==} - '@clack/prompts@0.8.2': - resolution: {integrity: sha512-6b9Ab2UiZwJYA9iMyboYyW9yJvAO9V753ZhS+DHKEjZRKAxPPOb7MXXu84lsPFG+vZt6FRFniZ8rXi+zCIw4yQ==} - - '@es-joy/jsdoccomment@0.48.0': - resolution: {integrity: sha512-G6QUWIcC+KvSwXNsJyDTHvqUdNoAVJPPgkc3+Uk4WBKqZvoXhlvazOgm9aL0HwihJLQf0l+tOE2UFzXBqCqgDw==} - engines: {node: '>=16'} + '@clack/prompts@0.9.0': + resolution: {integrity: sha512-nGsytiExgUr4FL0pR/LeqxA28nz3E0cW7eLTSh3Iod9TGrbBt8Y7BHbV3mmkNC4G0evdYyQ3ZsbiBkk7ektArA==} '@es-joy/jsdoccomment@0.49.0': resolution: {integrity: sha512-xjZTSFgECpb9Ohuk5yMX5RhUEbfeQcuOp8IF60e+wyzWEF0M5xeSgqsfLtvPEX8BIyOX9saZqzuGPmZ8oWc+5Q==} engines: {node: '>=16'} - '@esbuild/aix-ppc64@0.24.0': - resolution: {integrity: sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==} + '@esbuild/aix-ppc64@0.21.5': + resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + + '@esbuild/aix-ppc64@0.24.2': + resolution: {integrity: sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] - '@esbuild/android-arm64@0.24.0': - resolution: {integrity: sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==} + '@esbuild/android-arm64@0.21.5': + resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + + '@esbuild/android-arm64@0.24.2': + resolution: {integrity: sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==} engines: {node: '>=18'} cpu: [arm64] os: [android] - '@esbuild/android-arm@0.24.0': - resolution: {integrity: sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==} + '@esbuild/android-arm@0.21.5': + resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + + '@esbuild/android-arm@0.24.2': + resolution: {integrity: sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==} engines: {node: '>=18'} cpu: [arm] os: [android] - '@esbuild/android-x64@0.24.0': - resolution: {integrity: sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==} + '@esbuild/android-x64@0.21.5': + resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + + '@esbuild/android-x64@0.24.2': + resolution: {integrity: sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==} engines: {node: '>=18'} cpu: [x64] os: [android] - '@esbuild/darwin-arm64@0.24.0': - resolution: {integrity: sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==} + '@esbuild/darwin-arm64@0.21.5': + resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + + '@esbuild/darwin-arm64@0.24.2': + resolution: {integrity: sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] - '@esbuild/darwin-x64@0.24.0': - resolution: {integrity: sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==} + '@esbuild/darwin-x64@0.21.5': + resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + + '@esbuild/darwin-x64@0.24.2': + resolution: {integrity: sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==} engines: {node: '>=18'} cpu: [x64] os: [darwin] - '@esbuild/freebsd-arm64@0.24.0': - resolution: {integrity: sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==} + '@esbuild/freebsd-arm64@0.21.5': + resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + + '@esbuild/freebsd-arm64@0.24.2': + resolution: {integrity: sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] - '@esbuild/freebsd-x64@0.24.0': - resolution: {integrity: sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==} + '@esbuild/freebsd-x64@0.21.5': + resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + + '@esbuild/freebsd-x64@0.24.2': + resolution: {integrity: sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] - '@esbuild/linux-arm64@0.24.0': - resolution: {integrity: sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==} + '@esbuild/linux-arm64@0.21.5': + resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + + '@esbuild/linux-arm64@0.24.2': + resolution: {integrity: sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==} engines: {node: '>=18'} cpu: [arm64] os: [linux] - '@esbuild/linux-arm@0.24.0': - resolution: {integrity: sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==} + '@esbuild/linux-arm@0.21.5': + resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + + '@esbuild/linux-arm@0.24.2': + resolution: {integrity: sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==} engines: {node: '>=18'} cpu: [arm] os: [linux] - '@esbuild/linux-ia32@0.24.0': - resolution: {integrity: sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==} + '@esbuild/linux-ia32@0.21.5': + resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + + '@esbuild/linux-ia32@0.24.2': + resolution: {integrity: sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==} engines: {node: '>=18'} cpu: [ia32] os: [linux] - '@esbuild/linux-loong64@0.24.0': - resolution: {integrity: sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==} + '@esbuild/linux-loong64@0.21.5': + resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + + '@esbuild/linux-loong64@0.24.2': + resolution: {integrity: sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==} engines: {node: '>=18'} cpu: [loong64] os: [linux] - '@esbuild/linux-mips64el@0.24.0': - resolution: {integrity: sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==} + '@esbuild/linux-mips64el@0.21.5': + resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + + '@esbuild/linux-mips64el@0.24.2': + resolution: {integrity: sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] - '@esbuild/linux-ppc64@0.24.0': - resolution: {integrity: sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==} + '@esbuild/linux-ppc64@0.21.5': + resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + + '@esbuild/linux-ppc64@0.24.2': + resolution: {integrity: sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] - '@esbuild/linux-riscv64@0.24.0': - resolution: {integrity: sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==} + '@esbuild/linux-riscv64@0.21.5': + resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + + '@esbuild/linux-riscv64@0.24.2': + resolution: {integrity: sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] - '@esbuild/linux-s390x@0.24.0': - resolution: {integrity: sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==} + '@esbuild/linux-s390x@0.21.5': + resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + + '@esbuild/linux-s390x@0.24.2': + resolution: {integrity: sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==} engines: {node: '>=18'} cpu: [s390x] os: [linux] - '@esbuild/linux-x64@0.24.0': - resolution: {integrity: sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==} + '@esbuild/linux-x64@0.21.5': + resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + + '@esbuild/linux-x64@0.24.2': + resolution: {integrity: sha512-8Qi4nQcCTbLnK9WoMjdC9NiTG6/E38RNICU6sUNqK0QFxCYgoARqVqxdFmWkdonVsvGqWhmm7MO0jyTqLqwj0Q==} engines: {node: '>=18'} cpu: [x64] os: [linux] - '@esbuild/netbsd-x64@0.24.0': - resolution: {integrity: sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==} + '@esbuild/netbsd-arm64@0.24.2': + resolution: {integrity: sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [netbsd] + + '@esbuild/netbsd-x64@0.21.5': + resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + + '@esbuild/netbsd-x64@0.24.2': + resolution: {integrity: sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] - '@esbuild/openbsd-arm64@0.24.0': - resolution: {integrity: sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==} + '@esbuild/openbsd-arm64@0.24.2': + resolution: {integrity: sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] - '@esbuild/openbsd-x64@0.24.0': - resolution: {integrity: sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==} + '@esbuild/openbsd-x64@0.21.5': + resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + + '@esbuild/openbsd-x64@0.24.2': + resolution: {integrity: sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==} engines: {node: '>=18'} cpu: [x64] os: [openbsd] - '@esbuild/sunos-x64@0.24.0': - resolution: {integrity: sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==} + '@esbuild/sunos-x64@0.21.5': + resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + + '@esbuild/sunos-x64@0.24.2': + resolution: {integrity: sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==} engines: {node: '>=18'} cpu: [x64] os: [sunos] - '@esbuild/win32-arm64@0.24.0': - resolution: {integrity: sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==} + '@esbuild/win32-arm64@0.21.5': + resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + + '@esbuild/win32-arm64@0.24.2': + resolution: {integrity: sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==} engines: {node: '>=18'} cpu: [arm64] os: [win32] - '@esbuild/win32-ia32@0.24.0': - resolution: {integrity: sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==} + '@esbuild/win32-ia32@0.21.5': + resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + + '@esbuild/win32-ia32@0.24.2': + resolution: {integrity: sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==} engines: {node: '>=18'} cpu: [ia32] os: [win32] - '@esbuild/win32-x64@0.24.0': - resolution: {integrity: sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==} + '@esbuild/win32-x64@0.21.5': + resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + + '@esbuild/win32-x64@0.24.2': + resolution: {integrity: sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==} engines: {node: '>=18'} cpu: [x64] os: [win32] @@ -447,8 +587,8 @@ packages: resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - '@eslint/compat@1.2.3': - resolution: {integrity: sha512-wlZhwlDFxkxIZ571aH0FoK4h4Vwx7P3HJx62Gp8hTc10bfpwT2x0nULuAHmQSJBOWPgPeVf+9YtnD4j50zVHmA==} + '@eslint/compat@1.2.4': + resolution: {integrity: sha512-S8ZdQj/N69YAtuqFt7653jwcvuUj131+6qGLUyDqfDg1OIoBQ66OCuXC473YQfO2AaxITTutiRQiDwoo7ZLYyg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^9.10.0 @@ -456,32 +596,32 @@ packages: eslint: optional: true - '@eslint/config-array@0.19.0': - resolution: {integrity: sha512-zdHg2FPIFNKPdcHWtiNT+jEFCHYVplAXRDlQDyqy0zGx/q2parwh7brGJSiTxRk/TSMkbM//zt/f5CHgyTyaSQ==} + '@eslint/config-array@0.19.1': + resolution: {integrity: sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/core@0.9.0': - resolution: {integrity: sha512-7ATR9F0e4W85D/0w7cU0SNj7qkAexMG+bAHEZOjo9akvGuhHE2m7umzWzfnpa0XAg5Kxc1BWmtPMV67jJ+9VUg==} + '@eslint/core@0.9.1': + resolution: {integrity: sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/eslintrc@3.2.0': resolution: {integrity: sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/js@9.16.0': - resolution: {integrity: sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==} + '@eslint/js@9.17.0': + resolution: {integrity: sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/markdown@6.2.1': resolution: {integrity: sha512-cKVd110hG4ICHmWhIwZJfKmmJBvbiDWyrHODJknAtudKgZtlROGoLX9UEOA0o746zC0hCY4UV4vR+aOGW9S6JQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/object-schema@2.1.4': - resolution: {integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==} + '@eslint/object-schema@2.1.5': + resolution: {integrity: sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/plugin-kit@0.2.3': - resolution: {integrity: sha512-2b/g5hRmpbb1o4GnTZax9N9m0FXzz9OV42ZzI4rDDMDuHUqigAiQCEWChBWCY4ztAGVRjoWT19v0yMmc5/L5kA==} + '@eslint/plugin-kit@0.2.4': + resolution: {integrity: sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@humanfs/core@0.19.1': @@ -525,46 +665,46 @@ packages: vue-i18n: optional: true - '@intlify/core-base@10.0.5': - resolution: {integrity: sha512-F3snDTQs0MdvnnyzTDTVkOYVAZOE/MHwRvF7mn7Jw1yuih4NrFYLNYIymGlLmq4HU2iIdzYsZ7f47bOcwY73XQ==} + '@intlify/core-base@11.0.1': + resolution: {integrity: sha512-NAmhw1l/llM0HZRpagR/ChJTNymW4ll6/4EDSJML5c8L5Hl/+k6UyF8EIgE6DeHpfheQujkSRngauViHqq6jJQ==} engines: {node: '>= 16'} '@intlify/core-base@9.14.2': resolution: {integrity: sha512-DZyQ4Hk22sC81MP4qiCDuU+LdaYW91A6lCjq8AWPvY3+mGMzhGDfOCzvyR6YBQxtlPjFqMoFk9ylnNYRAQwXtQ==} engines: {node: '>= 16'} - '@intlify/eslint-plugin-vue-i18n@3.1.0': - resolution: {integrity: sha512-X9EhEu7KHFUsbTteVYQn0BCPCh0udrC/KEukn5LWkkiZGY5jGtdLrxwUNIZudKGoXJOOxDfdEBPBnstm4QWVaQ==} + '@intlify/eslint-plugin-vue-i18n@3.2.0': + resolution: {integrity: sha512-TOIrD4tJE48WMyVIB8bNeQJJPYo1Prpqnm9Xpn1UZmcqlELhm8hmP8QyJnkgesfbG7hyiX/kvo63W7ClEQmhpg==} engines: {node: '>=18.0.0'} peerDependencies: eslint: ^8.0.0 || ^9.0.0-0 - '@intlify/message-compiler@10.0.5': - resolution: {integrity: sha512-6GT1BJ852gZ0gItNZN2krX5QAmea+cmdjMvsWohArAZ3GmHdnNANEcF9JjPXAMRtQ6Ux5E269ymamg/+WU6tQA==} + '@intlify/message-compiler@11.0.0-rc.1': + resolution: {integrity: sha512-TGw2uBfuTFTegZf/BHtUQBEKxl7Q/dVGLoqRIdw8lFsp9g/53sYn5iD+0HxIzdYjbWL6BTJMXCPUHp9PxDTRPw==} engines: {node: '>= 16'} - '@intlify/message-compiler@11.0.0-beta.2': - resolution: {integrity: sha512-/cJHP1n45Zlf9tbm/hudLrUwXzJZngR9OMTQk32H1S4lBjM2996wzKTHuLbaJJlJZNTTjnfWZUHPb+F6sE6p1Q==} + '@intlify/message-compiler@11.0.1': + resolution: {integrity: sha512-5RFH8x+Mn3mbjcHXnb6KCXGiczBdiQkWkv99iiA0JpKrNuTAQeW59Pjq/uObMB0eR0shnKYGTkIJxum+DbL3sw==} engines: {node: '>= 16'} '@intlify/message-compiler@9.14.2': resolution: {integrity: sha512-YsKKuV4Qv4wrLNsvgWbTf0E40uRv+Qiw1BeLQ0LAxifQuhiMe+hfTIzOMdWj/ZpnTDj4RSZtkXjJM7JDiiB5LQ==} engines: {node: '>= 16'} - '@intlify/shared@10.0.5': - resolution: {integrity: sha512-bmsP4L2HqBF6i6uaMqJMcFBONVjKt+siGluRq4Ca4C0q7W2eMaVZr8iCgF9dKbcVXutftkC7D6z2SaSMmLiDyA==} + '@intlify/shared@11.0.0-rc.1': + resolution: {integrity: sha512-8tR1xe7ZEbkabTuE/tNhzpolygUn9OaYp9yuYAF4MgDNZg06C3Qny80bes2/e9/Wm3aVkPUlCw6WgU7mQd0yEg==} engines: {node: '>= 16'} - '@intlify/shared@11.0.0-beta.2': - resolution: {integrity: sha512-N6ngJfFaVA0l2iLtx/SymgHOBW4wiS5Pyue7YmY/G+mrGjesi+S+U+u/Xlv6pZa/YIBfeM4QB07lI7rz1YqKLg==} + '@intlify/shared@11.0.1': + resolution: {integrity: sha512-lH164+aDDptHZ3dBDbIhRa1dOPQUp+83iugpc+1upTOWCnwyC1PVis6rSWNMMJ8VQxvtHQB9JMib48K55y0PvQ==} engines: {node: '>= 16'} '@intlify/shared@9.14.2': resolution: {integrity: sha512-uRAHAxYPeF+G5DBIboKpPgC/Waecd4Jz8ihtkpJQD5ycb5PwXp0k/+hBGl5dAjwF7w+l74kz/PKA8r8OK//RUw==} engines: {node: '>= 16'} - '@intlify/unplugin-vue-i18n@6.0.0': - resolution: {integrity: sha512-PhFdVR0YggJcvbFrfXTKRv5S6/DPy7FPBtepVIloDpOvco5FHJYKHyaPXqMMWhN1o8MiD2KnSwS2222zWAQs+A==} + '@intlify/unplugin-vue-i18n@6.0.2': + resolution: {integrity: sha512-5AuwBfdFtA4OSh31tfGpjhvmh7BVCzClHCgFlVdNM3ojyai3UZY4ViYh35TlE1xeWFyduOtUsG12r70xy24nzg==} engines: {node: '>= 18'} peerDependencies: petite-vue-i18n: '*' @@ -598,8 +738,8 @@ packages: resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==} engines: {node: '>=12'} - '@jridgewell/gen-mapping@0.3.5': - resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} + '@jridgewell/gen-mapping@0.3.8': + resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==} engines: {node: '>=6.0.0'} '@jridgewell/resolve-uri@3.1.2': @@ -647,8 +787,8 @@ packages: resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==} engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} - '@rollup/pluginutils@5.1.3': - resolution: {integrity: sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==} + '@rollup/pluginutils@5.1.4': + resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==} engines: {node: '>=14.0.0'} peerDependencies: rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0 @@ -656,93 +796,98 @@ packages: rollup: optional: true - '@rollup/rollup-android-arm-eabi@4.28.0': - resolution: {integrity: sha512-wLJuPLT6grGZsy34g4N1yRfYeouklTgPhH1gWXCYspenKYD0s3cR99ZevOGw5BexMNywkbV3UkjADisozBmpPQ==} + '@rollup/rollup-android-arm-eabi@4.29.1': + resolution: {integrity: sha512-ssKhA8RNltTZLpG6/QNkCSge+7mBQGUqJRisZ2MDQcEGaK93QESEgWK2iOpIDZ7k9zPVkG5AS3ksvD5ZWxmItw==} cpu: [arm] os: [android] - '@rollup/rollup-android-arm64@4.28.0': - resolution: {integrity: sha512-eiNkznlo0dLmVG/6wf+Ifi/v78G4d4QxRhuUl+s8EWZpDewgk7PX3ZyECUXU0Zq/Ca+8nU8cQpNC4Xgn2gFNDA==} + '@rollup/rollup-android-arm64@4.29.1': + resolution: {integrity: sha512-CaRfrV0cd+NIIcVVN/jx+hVLN+VRqnuzLRmfmlzpOzB87ajixsN/+9L5xNmkaUUvEbI5BmIKS+XTwXsHEb65Ew==} cpu: [arm64] os: [android] - '@rollup/rollup-darwin-arm64@4.28.0': - resolution: {integrity: sha512-lmKx9yHsppblnLQZOGxdO66gT77bvdBtr/0P+TPOseowE7D9AJoBw8ZDULRasXRWf1Z86/gcOdpBrV6VDUY36Q==} + '@rollup/rollup-darwin-arm64@4.29.1': + resolution: {integrity: sha512-2ORr7T31Y0Mnk6qNuwtyNmy14MunTAMx06VAPI6/Ju52W10zk1i7i5U3vlDRWjhOI5quBcrvhkCHyF76bI7kEw==} cpu: [arm64] os: [darwin] - '@rollup/rollup-darwin-x64@4.28.0': - resolution: {integrity: sha512-8hxgfReVs7k9Js1uAIhS6zq3I+wKQETInnWQtgzt8JfGx51R1N6DRVy3F4o0lQwumbErRz52YqwjfvuwRxGv1w==} + '@rollup/rollup-darwin-x64@4.29.1': + resolution: {integrity: sha512-j/Ej1oanzPjmN0tirRd5K2/nncAhS9W6ICzgxV+9Y5ZsP0hiGhHJXZ2JQ53iSSjj8m6cRY6oB1GMzNn2EUt6Ng==} cpu: [x64] os: [darwin] - '@rollup/rollup-freebsd-arm64@4.28.0': - resolution: {integrity: sha512-lA1zZB3bFx5oxu9fYud4+g1mt+lYXCoch0M0V/xhqLoGatbzVse0wlSQ1UYOWKpuSu3gyN4qEc0Dxf/DII1bhQ==} + '@rollup/rollup-freebsd-arm64@4.29.1': + resolution: {integrity: sha512-91C//G6Dm/cv724tpt7nTyP+JdN12iqeXGFM1SqnljCmi5yTXriH7B1r8AD9dAZByHpKAumqP1Qy2vVNIdLZqw==} cpu: [arm64] os: [freebsd] - '@rollup/rollup-freebsd-x64@4.28.0': - resolution: {integrity: sha512-aI2plavbUDjCQB/sRbeUZWX9qp12GfYkYSJOrdYTL/C5D53bsE2/nBPuoiJKoWp5SN78v2Vr8ZPnB+/VbQ2pFA==} + '@rollup/rollup-freebsd-x64@4.29.1': + resolution: {integrity: sha512-hEioiEQ9Dec2nIRoeHUP6hr1PSkXzQaCUyqBDQ9I9ik4gCXQZjJMIVzoNLBRGet+hIUb3CISMh9KXuCcWVW/8w==} cpu: [x64] os: [freebsd] - '@rollup/rollup-linux-arm-gnueabihf@4.28.0': - resolution: {integrity: sha512-WXveUPKtfqtaNvpf0iOb0M6xC64GzUX/OowbqfiCSXTdi/jLlOmH0Ba94/OkiY2yTGTwteo4/dsHRfh5bDCZ+w==} + '@rollup/rollup-linux-arm-gnueabihf@4.29.1': + resolution: {integrity: sha512-Py5vFd5HWYN9zxBv3WMrLAXY3yYJ6Q/aVERoeUFwiDGiMOWsMs7FokXihSOaT/PMWUty/Pj60XDQndK3eAfE6A==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm-musleabihf@4.28.0': - resolution: {integrity: sha512-yLc3O2NtOQR67lI79zsSc7lk31xjwcaocvdD1twL64PK1yNaIqCeWI9L5B4MFPAVGEVjH5k1oWSGuYX1Wutxpg==} + '@rollup/rollup-linux-arm-musleabihf@4.29.1': + resolution: {integrity: sha512-RiWpGgbayf7LUcuSNIbahr0ys2YnEERD4gYdISA06wa0i8RALrnzflh9Wxii7zQJEB2/Eh74dX4y/sHKLWp5uQ==} cpu: [arm] os: [linux] - '@rollup/rollup-linux-arm64-gnu@4.28.0': - resolution: {integrity: sha512-+P9G9hjEpHucHRXqesY+3X9hD2wh0iNnJXX/QhS/J5vTdG6VhNYMxJ2rJkQOxRUd17u5mbMLHM7yWGZdAASfcg==} + '@rollup/rollup-linux-arm64-gnu@4.29.1': + resolution: {integrity: sha512-Z80O+taYxTQITWMjm/YqNoe9d10OX6kDh8X5/rFCMuPqsKsSyDilvfg+vd3iXIqtfmp+cnfL1UrYirkaF8SBZA==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-arm64-musl@4.28.0': - resolution: {integrity: sha512-1xsm2rCKSTpKzi5/ypT5wfc+4bOGa/9yI/eaOLW0oMs7qpC542APWhl4A37AENGZ6St6GBMWhCCMM6tXgTIplw==} + '@rollup/rollup-linux-arm64-musl@4.29.1': + resolution: {integrity: sha512-fOHRtF9gahwJk3QVp01a/GqS4hBEZCV1oKglVVq13kcK3NeVlS4BwIFzOHDbmKzt3i0OuHG4zfRP0YoG5OF/rA==} cpu: [arm64] os: [linux] - '@rollup/rollup-linux-powerpc64le-gnu@4.28.0': - resolution: {integrity: sha512-zgWxMq8neVQeXL+ouSf6S7DoNeo6EPgi1eeqHXVKQxqPy1B2NvTbaOUWPn/7CfMKL7xvhV0/+fq/Z/J69g1WAQ==} + '@rollup/rollup-linux-loongarch64-gnu@4.29.1': + resolution: {integrity: sha512-5a7q3tnlbcg0OodyxcAdrrCxFi0DgXJSoOuidFUzHZ2GixZXQs6Tc3CHmlvqKAmOs5eRde+JJxeIf9DonkmYkw==} + cpu: [loong64] + os: [linux] + + '@rollup/rollup-linux-powerpc64le-gnu@4.29.1': + resolution: {integrity: sha512-9b4Mg5Yfz6mRnlSPIdROcfw1BU22FQxmfjlp/CShWwO3LilKQuMISMTtAu/bxmmrE6A902W2cZJuzx8+gJ8e9w==} cpu: [ppc64] os: [linux] - '@rollup/rollup-linux-riscv64-gnu@4.28.0': - resolution: {integrity: sha512-VEdVYacLniRxbRJLNtzwGt5vwS0ycYshofI7cWAfj7Vg5asqj+pt+Q6x4n+AONSZW/kVm+5nklde0qs2EUwU2g==} + '@rollup/rollup-linux-riscv64-gnu@4.29.1': + resolution: {integrity: sha512-G5pn0NChlbRM8OJWpJFMX4/i8OEU538uiSv0P6roZcbpe/WfhEO+AT8SHVKfp8qhDQzaz7Q+1/ixMy7hBRidnQ==} cpu: [riscv64] os: [linux] - '@rollup/rollup-linux-s390x-gnu@4.28.0': - resolution: {integrity: sha512-LQlP5t2hcDJh8HV8RELD9/xlYtEzJkm/aWGsauvdO2ulfl3QYRjqrKW+mGAIWP5kdNCBheqqqYIGElSRCaXfpw==} + '@rollup/rollup-linux-s390x-gnu@4.29.1': + resolution: {integrity: sha512-WM9lIkNdkhVwiArmLxFXpWndFGuOka4oJOZh8EP3Vb8q5lzdSCBuhjavJsw68Q9AKDGeOOIHYzYm4ZFvmWez5g==} cpu: [s390x] os: [linux] - '@rollup/rollup-linux-x64-gnu@4.28.0': - resolution: {integrity: sha512-Nl4KIzteVEKE9BdAvYoTkW19pa7LR/RBrT6F1dJCV/3pbjwDcaOq+edkP0LXuJ9kflW/xOK414X78r+K84+msw==} + '@rollup/rollup-linux-x64-gnu@4.29.1': + resolution: {integrity: sha512-87xYCwb0cPGZFoGiErT1eDcssByaLX4fc0z2nRM6eMtV9njAfEE6OW3UniAoDhX4Iq5xQVpE6qO9aJbCFumKYQ==} cpu: [x64] os: [linux] - '@rollup/rollup-linux-x64-musl@4.28.0': - resolution: {integrity: sha512-eKpJr4vBDOi4goT75MvW+0dXcNUqisK4jvibY9vDdlgLx+yekxSm55StsHbxUsRxSTt3JEQvlr3cGDkzcSP8bw==} + '@rollup/rollup-linux-x64-musl@4.29.1': + resolution: {integrity: sha512-xufkSNppNOdVRCEC4WKvlR1FBDyqCSCpQeMMgv9ZyXqqtKBfkw1yfGMTUTs9Qsl6WQbJnsGboWCp7pJGkeMhKA==} cpu: [x64] os: [linux] - '@rollup/rollup-win32-arm64-msvc@4.28.0': - resolution: {integrity: sha512-Vi+WR62xWGsE/Oj+mD0FNAPY2MEox3cfyG0zLpotZdehPFXwz6lypkGs5y38Jd/NVSbOD02aVad6q6QYF7i8Bg==} + '@rollup/rollup-win32-arm64-msvc@4.29.1': + resolution: {integrity: sha512-F2OiJ42m77lSkizZQLuC+jiZ2cgueWQL5YC9tjo3AgaEw+KJmVxHGSyQfDUoYR9cci0lAywv2Clmckzulcq6ig==} cpu: [arm64] os: [win32] - '@rollup/rollup-win32-ia32-msvc@4.28.0': - resolution: {integrity: sha512-kN/Vpip8emMLn/eOza+4JwqDZBL6MPNpkdaEsgUtW1NYN3DZvZqSQrbKzJcTL6hd8YNmFTn7XGWMwccOcJBL0A==} + '@rollup/rollup-win32-ia32-msvc@4.29.1': + resolution: {integrity: sha512-rYRe5S0FcjlOBZQHgbTKNrqxCBUmgDJem/VQTCcTnA2KCabYSWQDrytOzX7avb79cAAweNmMUb/Zw18RNd4mng==} cpu: [ia32] os: [win32] - '@rollup/rollup-win32-x64-msvc@4.28.0': - resolution: {integrity: sha512-Bvno2/aZT6usSa7lRDL2+hMjVAGjuqaymF1ApZm31JXzniR/hvr14jpU+/z4X6Gt5BPlzosscyJZGUvguXIqeQ==} + '@rollup/rollup-win32-x64-msvc@4.29.1': + resolution: {integrity: sha512-+10CMg9vt1MoHj6x1pxyjPSMjHTIlqs8/tBztXvPAx24SKs9jwVnKqHJumlH/IzhaPUaj3T6T6wfZr8okdXaIg==} cpu: [x64] os: [win32] @@ -750,8 +895,8 @@ packages: resolution: {integrity: sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==} engines: {node: '>=10'} - '@stylistic/eslint-plugin@2.11.0': - resolution: {integrity: sha512-PNRHbydNG5EH8NK4c+izdJlxajIR6GxcUhzsYNRsn6Myep4dsZt0qFCz3rCPnkvgO5FYibDcMqgNHUT+zvjYZw==} + '@stylistic/eslint-plugin@2.12.1': + resolution: {integrity: sha512-fubZKIHSPuo07FgRTn6S4Nl0uXPRPYVNpyZzIDGfp7Fny6JjNus6kReLD7NI380JXi4HtUTSOZ34LBuNPO1XLQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: '>=8.40.0' @@ -763,6 +908,9 @@ packages: '@types/debug@4.1.12': resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==} + '@types/doctrine@0.0.9': + resolution: {integrity: sha512-eOIHzCUSH7SMfonMG1LsC2f8vxBFtho6NGBznK41R84YzPuvSBzrhEps33IsQiOW9+VL6NQ9DbjQJznk/S4uRA==} + '@types/eslint@9.6.1': resolution: {integrity: sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==} @@ -784,8 +932,8 @@ packages: '@types/ms@0.7.34': resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==} - '@types/node@22.10.1': - resolution: {integrity: sha512-qKgsUwfHZV2WCWLAnVP1JqnpE6Im6h3Y0+fYgMTasNQ7V++CBX5OT1as0g0f+OyubbFqhf6XVNIsmN4IIhEgGQ==} + '@types/node@22.10.2': + resolution: {integrity: sha512-Xxr6BBRCAOQixvonOye19wnzyDiUtTeqldOOmj3CkeblonbccA12PFwlufvRdrpjXxqnmUaeiU5EOA+7s5diUQ==} '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} @@ -808,66 +956,51 @@ packages: '@types/web-bluetooth@0.0.20': resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==} - '@typescript-eslint/eslint-plugin@8.16.0': - resolution: {integrity: sha512-5YTHKV8MYlyMI6BaEG7crQ9BhSc8RxzshOReKwZwRWN0+XvvTOm+L/UYLCYxFpfwYuAAqhxiq4yae0CMFwbL7Q==} + '@typescript-eslint/eslint-plugin@8.18.2': + resolution: {integrity: sha512-adig4SzPLjeQ0Tm+jvsozSGiCliI2ajeURDGHjZ2llnA+A67HihCQ+a3amtPhUakd1GlwHxSRvzOZktbEvhPPg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 eslint: ^8.57.0 || ^9.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + typescript: '>=4.8.4 <5.8.0' - '@typescript-eslint/parser@8.16.0': - resolution: {integrity: sha512-D7DbgGFtsqIPIFMPJwCad9Gfi/hC0PWErRRHFnaCWoEDYi5tQUDiJCTmGUbBiLzjqAck4KcXt9Ayj0CNlIrF+w==} + '@typescript-eslint/parser@8.18.2': + resolution: {integrity: sha512-y7tcq4StgxQD4mDr9+Jb26dZ+HTZ/SkfqpXSiqeUXZHxOUyjWDKsmwKhJ0/tApR08DgOhrFAoAhyB80/p3ViuA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + typescript: '>=4.8.4 <5.8.0' - '@typescript-eslint/scope-manager@8.16.0': - resolution: {integrity: sha512-mwsZWubQvBki2t5565uxF0EYvG+FwdFb8bMtDuGQLdCCnGPrDEDvm1gtfynuKlnpzeBRqdFCkMf9jg1fnAK8sg==} + '@typescript-eslint/scope-manager@8.18.2': + resolution: {integrity: sha512-YJFSfbd0CJjy14r/EvWapYgV4R5CHzptssoag2M7y3Ra7XNta6GPAJPPP5KGB9j14viYXyrzRO5GkX7CRfo8/g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.16.0': - resolution: {integrity: sha512-IqZHGG+g1XCWX9NyqnI/0CX5LL8/18awQqmkZSl2ynn8F76j579dByc0jhfVSnSnhf7zv76mKBQv9HQFKvDCgg==} + '@typescript-eslint/type-utils@8.18.2': + resolution: {integrity: sha512-AB/Wr1Lz31bzHfGm/jgbFR0VB0SML/hd2P1yxzKDM48YmP7vbyJNHRExUE/wZsQj2wUCvbWH8poNHFuxLqCTnA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + typescript: '>=4.8.4 <5.8.0' - '@typescript-eslint/types@8.16.0': - resolution: {integrity: sha512-NzrHj6thBAOSE4d9bsuRNMvk+BvaQvmY4dDglgkgGC0EW/tB3Kelnp3tAKH87GEwzoxgeQn9fNGRyFJM/xd+GQ==} + '@typescript-eslint/types@8.18.2': + resolution: {integrity: sha512-Z/zblEPp8cIvmEn6+tPDIHUbRu/0z5lqZ+NvolL5SvXWT5rQy7+Nch83M0++XzO0XrWRFWECgOAyE8bsJTl1GQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.16.0': - resolution: {integrity: sha512-E2+9IzzXMc1iaBy9zmo+UYvluE3TW7bCGWSF41hVWUE01o8nzr1rvOQYSxelxr6StUvRcTMe633eY8mXASMaNw==} + '@typescript-eslint/typescript-estree@8.18.2': + resolution: {integrity: sha512-WXAVt595HjpmlfH4crSdM/1bcsqh+1weFRWIa9XMTx/XHZ9TCKMcr725tLYqWOgzKdeDrqVHxFotrvWcEsk2Tg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + typescript: '>=4.8.4 <5.8.0' - '@typescript-eslint/utils@8.16.0': - resolution: {integrity: sha512-C1zRy/mOL8Pj157GiX4kaw7iyRLKfJXBR3L82hk5kS/GyHcOFmy4YUq/zfZti72I9wnuQtA/+xzft4wCC8PJdA==} + '@typescript-eslint/utils@8.18.2': + resolution: {integrity: sha512-Cr4A0H7DtVIPkauj4sTSXVl+VBWewE9/o40KcF3TV9aqDEOWoXF3/+oRXNby3DYzZeCATvbdksYsGZzplwnK/Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - typescript: '*' - peerDependenciesMeta: - typescript: - optional: true + typescript: '>=4.8.4 <5.8.0' - '@typescript-eslint/visitor-keys@8.16.0': - resolution: {integrity: sha512-pq19gbaMOmFE3CbL0ZB8J8BFCo2ckfHBfaIsaOZgBIF4EoISJIdLX5xRhd0FGB0LlHReNRuzoJoMGpTjq8F2CQ==} + '@typescript-eslint/visitor-keys@8.18.2': + resolution: {integrity: sha512-zORcwn4C3trOWiCqFQP1x6G3xTRyZ1LYydnj51cRnJ6hxBlr/cKPckk+PKPUw/fXmvfKTcw7bwY3w9izgx5jZw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@vitejs/plugin-vue@5.2.1': @@ -877,8 +1010,8 @@ packages: vite: ^5.0.0 || ^6.0.0 vue: ^3.2.25 - '@vitest/eslint-plugin@1.1.13': - resolution: {integrity: sha512-oabbCT4fCQfmFNtH2UuDfHx1d7dzi+VD3qwCpBfECfyzQq/Re9u7qTtE2WqV/hAuAOALw3ZVRiub2mXmpTyn/Q==} + '@vitest/eslint-plugin@1.1.20': + resolution: {integrity: sha512-2eLsgUm+GVOpDfNyH2do//MiNO/WZkXrPi+EjDmXEdUt6Jwnziq4H221L8vJE0aJys+l1FRfSkm4QbaIyDCfBg==} peerDependencies: '@typescript-eslint/utils': '>= 8.0' eslint: '>= 8.57.0' @@ -890,43 +1023,43 @@ packages: vitest: optional: true - '@vitest/expect@2.1.6': - resolution: {integrity: sha512-9M1UR9CAmrhJOMoSwVnPh2rELPKhYo0m/CSgqw9PyStpxtkwhmdM6XYlXGKeYyERY1N6EIuzkQ7e3Lm1WKCoUg==} + '@vitest/expect@2.1.8': + resolution: {integrity: sha512-8ytZ/fFHq2g4PJVAtDX57mayemKgDR6X3Oa2Foro+EygiOJHUXhCqBAAKQYYajZpFoIfvBCF1j6R6IYRSIUFuw==} - '@vitest/mocker@2.1.6': - resolution: {integrity: sha512-MHZp2Z+Q/A3am5oD4WSH04f9B0T7UvwEb+v5W0kCYMhtXGYbdyl2NUk1wdSMqGthmhpiThPDp/hEoVwu16+u1A==} + '@vitest/mocker@2.1.8': + resolution: {integrity: sha512-7guJ/47I6uqfttp33mgo6ga5Gr1VnL58rcqYKyShoRK9ebu8T5Rs6HN3s1NABiBeVTdWNrwUMcHH54uXZBN4zA==} peerDependencies: msw: ^2.4.9 - vite: ^5.0.0 || ^6.0.0 + vite: ^5.0.0 peerDependenciesMeta: msw: optional: true vite: optional: true - '@vitest/pretty-format@2.1.6': - resolution: {integrity: sha512-exZyLcEnHgDMKc54TtHca4McV4sKT+NKAe9ix/yhd/qkYb/TP8HTyXRFDijV19qKqTZM0hPL4753zU/U8L/gAA==} + '@vitest/pretty-format@2.1.8': + resolution: {integrity: sha512-9HiSZ9zpqNLKlbIDRWOnAWqgcA7xu+8YxXSekhr0Ykab7PAYFkhkwoqVArPOtJhPmYeE2YHgKZlj3CP36z2AJQ==} - '@vitest/runner@2.1.6': - resolution: {integrity: sha512-SjkRGSFyrA82m5nz7To4CkRSEVWn/rwQISHoia/DB8c6IHIhaE/UNAo+7UfeaeJRE979XceGl00LNkIz09RFsA==} + '@vitest/runner@2.1.8': + resolution: {integrity: sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==} - '@vitest/snapshot@2.1.6': - resolution: {integrity: sha512-5JTWHw8iS9l3v4/VSuthCndw1lN/hpPB+mlgn1BUhFbobeIUj1J1V/Bj2t2ovGEmkXLTckFjQddsxS5T6LuVWw==} + '@vitest/snapshot@2.1.8': + resolution: {integrity: sha512-20T7xRFbmnkfcmgVEz+z3AU/3b0cEzZOt/zmnvZEctg64/QZbSDJEVm9fLnnlSi74KibmRsO9/Qabi+t0vCRPg==} - '@vitest/spy@2.1.6': - resolution: {integrity: sha512-oTFObV8bd4SDdRka5O+mSh5w9irgx5IetrD5i+OsUUsk/shsBoHifwCzy45SAORzAhtNiprUVaK3hSCCzZh1jQ==} + '@vitest/spy@2.1.8': + resolution: {integrity: sha512-5swjf2q95gXeYPevtW0BLk6H8+bPlMb4Vw/9Em4hFxDcaOxS+e0LOX4yqNxoHzMR2akEB2xfpnWUzkZokmgWDg==} - '@vitest/utils@2.1.6': - resolution: {integrity: sha512-ixNkFy3k4vokOUTU2blIUvOgKq/N2PW8vKIjZZYsGJCMX69MRa9J2sKqX5hY/k5O5Gty3YJChepkqZ3KM9LyIQ==} + '@vitest/utils@2.1.8': + resolution: {integrity: sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==} - '@volar/language-core@2.4.10': - resolution: {integrity: sha512-hG3Z13+nJmGaT+fnQzAkS0hjJRa2FCeqZt6Bd+oGNhUkQ+mTFsDETg5rqUTxyzIh5pSOGY7FHCWUS8G82AzLCA==} + '@volar/language-core@2.4.11': + resolution: {integrity: sha512-lN2C1+ByfW9/JRPpqScuZt/4OrUUse57GLI6TbLgTIqBVemdl1wNcZ1qYGEo2+Gw8coYLgCy7SuKqn6IrQcQgg==} - '@volar/source-map@2.4.10': - resolution: {integrity: sha512-OCV+b5ihV0RF3A7vEvNyHPi4G4kFa6ukPmyVocmqm5QzOd8r5yAtiNvaPEjl8dNvgC/lj4JPryeeHLdXd62rWA==} + '@volar/source-map@2.4.11': + resolution: {integrity: sha512-ZQpmafIGvaZMn/8iuvCFGrW3smeqkq/IIh9F1SdSx9aUl0J4Iurzd6/FhmjNO5g2ejF3rT45dKskgXWiofqlZQ==} - '@volar/typescript@2.4.10': - resolution: {integrity: sha512-F8ZtBMhSXyYKuBfGpYwqA5rsONnOwAVvjyE7KPYJ7wgZqo2roASqNWUnianOomJX5u1cxeRooHV59N0PhvEOgw==} + '@volar/typescript@2.4.11': + resolution: {integrity: sha512-2DT+Tdh88Spp5PyPbqhyoYavYCPDsqbHLFwcUI9K1NlY1YgUJvujGdrqUp0zWxnW7KWNTr3xSpMuv2WnaTKDAw==} '@vue/compiler-core@3.5.13': resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==} @@ -946,8 +1079,8 @@ packages: '@vue/devtools-api@6.6.4': resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==} - '@vue/language-core@2.1.10': - resolution: {integrity: sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==} + '@vue/language-core@2.2.0': + resolution: {integrity: sha512-O1ZZFaaBGkKbsRfnVH1ifOK1/1BUkyK+3SQsfnh6PmMmD4qJcTU8godCeA96jjDRTL6zgnK7YzCHfaUlH2r0Mw==} peerDependencies: typescript: '*' peerDependenciesMeta: @@ -974,14 +1107,14 @@ packages: '@vue/test-utils@2.4.6': resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==} - '@vueuse/core@12.0.0': - resolution: {integrity: sha512-C12RukhXiJCbx4MGhjmd/gH52TjJsc3G0E0kQj/kb19H3Nt6n1CA4DRWuTdWWcaFRdlTe0npWDS942mvacvNBw==} + '@vueuse/core@12.2.0': + resolution: {integrity: sha512-jksyNu+5EGwggNkRWd6xX+8qBkYbmrwdFQMgCABsz+wq8bKF6w3soPFLB8vocFp3wFIzn0OYkSPM9JP+AFKwsg==} - '@vueuse/metadata@12.0.0': - resolution: {integrity: sha512-Yzimd1D3sjxTDOlF05HekU5aSGdKjxhuhRFHA7gDWLn57PRbBIh+SF5NmjhJ0WRgF3my7T8LBucyxdFJjIfRJQ==} + '@vueuse/metadata@12.2.0': + resolution: {integrity: sha512-x6zynZtTh1l52m0y8d/EgzpshnMjg8cNZ2KWoncJ62Z5qPSGoc4FUunmMVrrRM/I/5542rTEY89CGftngZvrkQ==} - '@vueuse/shared@12.0.0': - resolution: {integrity: sha512-3i6qtcq2PIio5i/vVYidkkcgvmTjCqrf26u+Fd4LhnbBmIT6FN8y6q/GJERp8lfcB9zVEfjdV0Br0443qZuJpw==} + '@vueuse/shared@12.2.0': + resolution: {integrity: sha512-SRr4AZwv/giS+EmyA1ZIzn3/iALjjnWAGaBNmoDTMEob9JwQaevAocuaMDnPAvU7Z35Y5g3CFRusCWgp1gVJ3Q==} '@windicss/config@1.9.4': resolution: {integrity: sha512-vKXJlEC01/LFuYLF6XZsrCv13QKsxByWFqzDRctTva+O4yqr5j0e5VWB4Dr2tgzVbZuYG5ewg7qywAI/9JD0Cw==} @@ -1003,15 +1136,15 @@ packages: engines: {node: '>=0.4.0'} hasBin: true - agent-base@7.1.1: - resolution: {integrity: sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==} + agent-base@7.1.3: + resolution: {integrity: sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==} engines: {node: '>= 14'} ajv@6.12.6: resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==} - alien-signals@0.2.2: - resolution: {integrity: sha512-cZIRkbERILsBOXTQmMrxc9hgpxglstn69zm+F1ARf4aPAzdAFYd6sBq87ErO0Fj3DV94tglcyHG5kQz9nDC/8A==} + alien-signals@0.4.9: + resolution: {integrity: sha512-piRGlMgQ65uRiY06mGU7I432AwPwAGf64TK1RXtM1Px4pPfLMTGI9TmsHTfioW1GukZRsNzkVQ/uHjhhd231Ow==} ansi-regex@5.0.1: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} @@ -1072,8 +1205,8 @@ packages: resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==} engines: {node: '>=8'} - browserslist@4.24.2: - resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==} + browserslist@4.24.3: + resolution: {integrity: sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true @@ -1089,8 +1222,8 @@ packages: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} - caniuse-lite@1.0.30001684: - resolution: {integrity: sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==} + caniuse-lite@1.0.30001690: + resolution: {integrity: sha512-5ExiE3qQN6oF8Clf8ifIDcMRCRE/dMGcETG/XGMD8/XiXm6HXQgQTh1yZYLXXpSOsEUlJm1Xr7kGULZTuGtP/w==} ccount@2.0.1: resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==} @@ -1217,8 +1350,8 @@ packages: supports-color: optional: true - debug@4.3.7: - resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==} + debug@4.4.0: + resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} engines: {node: '>=6.0'} peerDependencies: supports-color: '*' @@ -1268,8 +1401,8 @@ packages: resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==} engines: {node: '>= 4'} - dompurify@3.2.2: - resolution: {integrity: sha512-YMM+erhdZ2nkZ4fTNRTSI94mb7VG7uVF5vj5Zde7tImgnhZE3R6YW/IACGIHb2ux+QkEXMhe591N+5jWOmL4Zw==} + dompurify@3.2.3: + resolution: {integrity: sha512-U1U5Hzc2MO0oW3DF+G9qYN0aT7atAou4AgI0XjWz061nyBPbdxkfdhfy5uMgGn6+oLFCfn44ZGbdDqCzVmlOWA==} domutils@3.1.0: resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==} @@ -1282,8 +1415,8 @@ packages: engines: {node: '>=14'} hasBin: true - electron-to-chromium@1.5.67: - resolution: {integrity: sha512-nz88NNBsD7kQSAGGJyp8hS6xSPtWwqNogA0mjtc2nUYeEf3nURK9qpV18TuBdDmEDgVWotS8Wkzf+V52dSQ/LQ==} + electron-to-chromium@1.5.76: + resolution: {integrity: sha512-CjVQyG7n7Sr+eBXE86HIulnL5N8xZY1sgmOPGuq/F0Rr0FJq63lg0kEtOIDfZBk44FnDLf6FUJ+dsJcuiUDdDQ==} emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -1294,8 +1427,8 @@ packages: emojilib@2.4.0: resolution: {integrity: sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==} - enhanced-resolve@5.17.1: - resolution: {integrity: sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==} + enhanced-resolve@5.18.0: + resolution: {integrity: sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==} engines: {node: '>=10.13.0'} entities@4.5.0: @@ -1308,8 +1441,13 @@ packages: es-module-lexer@1.5.4: resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==} - esbuild@0.24.0: - resolution: {integrity: sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==} + esbuild@0.21.5: + resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==} + engines: {node: '>=12'} + hasBin: true + + esbuild@0.24.2: + resolution: {integrity: sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==} engines: {node: '>=18'} hasBin: true @@ -1378,8 +1516,8 @@ packages: peerDependencies: eslint: '*' - eslint-plugin-command@0.2.6: - resolution: {integrity: sha512-T0bHZ1oblW1xUHUVoBKZJR2osSNNGkfZuK4iqboNwuNS/M7tdp3pmURaJtTi/XDzitxaQ02lvOdFH0mUd5QLvQ==} + eslint-plugin-command@0.2.7: + resolution: {integrity: sha512-UXJ/1R6kdKDcHhiRqxHJ9RZ3juMR1IWQuSrnwt56qCjxt/am+5+YDt6GKs1FJPnppe6/geEYsO3CR9jc63i0xw==} peerDependencies: eslint: '*' @@ -1389,14 +1527,14 @@ packages: peerDependencies: eslint: '>=8' - eslint-plugin-import-x@4.4.3: - resolution: {integrity: sha512-QBprHvhLsfDhP++2T1NnjsOUt6bLDX3NMHaYwAB1FD3xmYTkdFH+HS1OamGhz28jLkRyIZa6UNAzTxbHnJwz5w==} + eslint-plugin-import-x@4.6.1: + resolution: {integrity: sha512-wluSUifMIb7UfwWXqx7Yx0lE/SGCcGXECLx/9bCmbY2nneLwvAZ4vkd1IXDjPKFvdcdUgr1BaRnaRpx3k2+Pfw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - eslint-plugin-jsdoc@50.6.0: - resolution: {integrity: sha512-tCNp4fR79Le3dYTPB0dKEv7yFyvGkUCa+Z3yuTrrNGGOxBlXo9Pn0PEgroOZikUQOGjxoGMVKNjrOHcYEdfszg==} + eslint-plugin-jsdoc@50.6.1: + resolution: {integrity: sha512-UWyaYi6iURdSfdVVqvfOs2vdCVz0J40O/z/HTsv2sFjdjmdlUI/qlKLOTmwbPQ2tAfQnE5F9vqx+B+poF71DBQ==} engines: {node: '>=18'} peerDependencies: eslint: ^7.0.0 || ^8.0.0 || ^9.0.0 @@ -1407,8 +1545,8 @@ packages: peerDependencies: eslint: '>=6.0.0' - eslint-plugin-n@17.14.0: - resolution: {integrity: sha512-maxPLMEA0rPmRpoOlxEclKng4UpDe+N5BJS4t24I3UKnN109Qcivnfs37KMy84G0af3bxjog5lKctP5ObsvcTA==} + eslint-plugin-n@17.15.1: + resolution: {integrity: sha512-KFw7x02hZZkBdbZEFQduRGH4VkIH4MW97ClsbAM4Y4E6KguBJWGfWG1P4HEIpZk2bkoWf0bojpnjNAhYQP8beA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: '>=8.23.0' @@ -1417,8 +1555,8 @@ packages: resolution: {integrity: sha512-brcKcxGnISN2CcVhXJ/kEQlNa0MEfGRtwKtWA16SkqXHKitaKIMrfemJKLKX1YqDU5C/5JY3PvZXd5jEW04e0Q==} engines: {node: '>=5.0.0'} - eslint-plugin-perfectionist@4.1.2: - resolution: {integrity: sha512-YjXPWB/rKe/gPUsyuxw75wTUrzN5MuJnRV0PH9NoonFvgcdVIXk551mkBKPr59nRZCbu7S3dFHwfo4gA42DB2w==} + eslint-plugin-perfectionist@4.4.0: + resolution: {integrity: sha512-B78pWxCsA2sClourpWEmWziCcjEsAEyxsNV5G6cxxteu/NI0/2en9XZUONf5e/+O+dgoLZsEPHQEhnIxJcnUvA==} engines: {node: ^18.0.0 || >=20.0.0} peerDependencies: eslint: '>=8.0.0' @@ -1435,8 +1573,8 @@ packages: peerDependencies: eslint: '>=8.44.0' - eslint-plugin-toml@0.11.1: - resolution: {integrity: sha512-Y1WuMSzfZpeMIrmlP1nUh3kT8p96mThIq4NnHrYUhg10IKQgGfBZjAWnrg9fBqguiX4iFps/x/3Hb5TxBisfdw==} + eslint-plugin-toml@0.12.0: + resolution: {integrity: sha512-+/wVObA9DVhwZB1nG83D2OAQRrcQZXy+drqUnFJKymqnmbnbfg/UPmEMCKrJNcEboUGxUjYrJlgy+/Y930mURQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: '>=6.0.0' @@ -1497,8 +1635,8 @@ packages: resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - eslint@9.16.0: - resolution: {integrity: sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA==} + eslint@9.17.0: + resolution: {integrity: sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} hasBin: true peerDependencies: @@ -1562,8 +1700,8 @@ packages: fast-levenshtein@2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} - fastq@1.17.1: - resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} + fastq@1.18.0: + resolution: {integrity: sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==} file-entry-cache@8.0.0: resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} @@ -1654,8 +1792,8 @@ packages: resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} engines: {node: '>=18'} - globals@15.13.0: - resolution: {integrity: sha512-49TewVEz0UxZjr1WYYsWpPrhyC/B/pA8Bq0fUmet2n+eR7yn0IvNzNaoBwnK6mdkzcN+se7Ez9zUgULTz2QH4g==} + globals@15.14.0: + resolution: {integrity: sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==} engines: {node: '>=18'} graceful-fs@4.2.11: @@ -1687,8 +1825,8 @@ packages: resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} engines: {node: '>= 14'} - https-proxy-agent@7.0.5: - resolution: {integrity: sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==} + https-proxy-agent@7.0.6: + resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==} engines: {node: '>= 14'} iconv-lite@0.6.3: @@ -1732,8 +1870,8 @@ packages: resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} engines: {node: '>=6'} - is-core-module@2.15.1: - resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==} + is-core-module@2.16.1: + resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==} engines: {node: '>= 0.4'} is-extglob@2.1.1: @@ -1764,8 +1902,8 @@ packages: jackspeak@3.4.3: resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==} - jiti@1.21.6: - resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} + jiti@1.21.7: + resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==} hasBin: true js-base64@3.7.7: @@ -1804,8 +1942,8 @@ packages: resolution: {integrity: sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==} hasBin: true - jsesc@3.0.2: - resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==} + jsesc@3.1.0: + resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==} engines: {node: '>=6'} hasBin: true @@ -1876,14 +2014,14 @@ packages: lru-cache@5.1.1: resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} - magic-string@0.30.14: - resolution: {integrity: sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw==} + magic-string@0.30.17: + resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==} markdown-table@3.0.4: resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==} - marked@15.0.3: - resolution: {integrity: sha512-Ai0cepvl2NHnTcO9jYDtcOEtVBNVYR31XnEA3BndO7f5As1wzpcOceSUM8FDkNLJNIODcLpDTWay/qQhqbuMvg==} + marked@15.0.4: + resolution: {integrity: sha512-TCHvDqmb3ZJ4PWG7VEGVgtefA5/euFmsIhxtD0XsBxI39gUSKL81mIRFdt0AiNQozUahd4ke98ZdirExd/vSEw==} engines: {node: '>= 18'} hasBin: true @@ -2066,12 +2204,12 @@ packages: resolution: {integrity: sha512-kKHJhxwpR/Okycz4HhQKKlhWe4ASEfPgkSWNmKFHd7+ezuQlxkA5cM3+XkBPvm1gmHen3w53qsYAv+8GwRrBlg==} engines: {node: '>=18'} - node-emoji@2.1.3: - resolution: {integrity: sha512-E2WEOVsgs7O16zsURJ/eH8BqhF029wGpEOnv7Urwdo2wmQanOACwJQh0devF9D9RhoZru0+9JXIS0dBXIAz+lA==} + node-emoji@2.2.0: + resolution: {integrity: sha512-Z3lTE9pLaJF47NyMhd4ww1yFTAP8YhYI8SleJiHzM46Fgpm5cnNzSl9XfzFNqbaz+VlJrIj3fXQ4DeN1Rjm6cw==} engines: {node: '>=18'} - node-releases@2.0.18: - resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==} + node-releases@2.0.19: + resolution: {integrity: sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==} nopt@7.2.1: resolution: {integrity: sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==} @@ -2117,8 +2255,8 @@ packages: package-json-from-dist@1.0.1: resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} - package-manager-detector@0.2.6: - resolution: {integrity: sha512-9vPH3qooBlYRJdmdYP00nvjZOulm40r5dhtal8st18ctf+6S1k7pi5yIHLvI4w5D70x0Y+xdVD9qITH0QO/A8A==} + package-manager-detector@0.2.8: + resolution: {integrity: sha512-ts9KSdroZisdvKMWVAVCXiKqnqNfXz4+IbrBG8/BWx/TR5le+jfenvoBuIZ6UWM9nz47W7AbD9qYfAwfWMIwzA==} parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} @@ -2179,15 +2317,12 @@ packages: resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} engines: {node: '>=12'} - pinia@2.2.8: - resolution: {integrity: sha512-NRTYy2g+kju5tBRe0oNlriZIbMNvma8ZJrpHsp3qudyiMEA8jMmPPKQ2QMHg0Oc4BkUyQYWagACabrwriCK9HQ==} + pinia@2.3.0: + resolution: {integrity: sha512-ohZj3jla0LL0OH5PlLTDMzqKiVw2XARmC1XYLdLWIPBMdhDW/123ZWr4zVAhtJm+aoSkFa13pYXskAvAscIkhQ==} peerDependencies: - '@vue/composition-api': ^1.4.0 typescript: '>=4.4.4' - vue: ^2.6.14 || ^3.5.11 + vue: ^2.7.0 || ^3.5.11 peerDependenciesMeta: - '@vue/composition-api': - optional: true typescript: optional: true @@ -2226,8 +2361,8 @@ packages: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} engines: {node: '>= 0.8.0'} - prettier@3.4.1: - resolution: {integrity: sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==} + prettier@3.4.2: + resolution: {integrity: sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==} engines: {node: '>=14'} hasBin: true @@ -2283,16 +2418,17 @@ packages: resolve-pkg-maps@1.0.0: resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} - resolve@1.22.8: - resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} + resolve@1.22.10: + resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==} + engines: {node: '>= 0.4'} hasBin: true reusify@1.0.4: resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==} engines: {iojs: '>=1.0.0', node: '>=0.10.0'} - rollup@4.28.0: - resolution: {integrity: sha512-G9GOrmgWHBma4YfCcX8PjH0qhXSdH8B4HDE2o4/jaxj93S4DPCIDoLcXz99eWMji4hB29UFCEd7B2gwGJDR9cQ==} + rollup@4.29.1: + resolution: {integrity: sha512-RaJ45M/kmJUzSWDs1Nnd5DdV4eerC98idtUOVr6FfKcgxqvjwHmxc5upLF9qZU9EpsVzzhleFahrT3shLuJzIw==} engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true @@ -2336,8 +2472,8 @@ packages: resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==} engines: {node: '>=14'} - simple-icons@13.19.0: - resolution: {integrity: sha512-N4mUzqRGm1/V3IRyxibGZXwPO1QdwIZmZADn7O6oam2Rz/vnf8TaysvwMy3gIobObthROroa9/oXN31E9gI3zA==} + simple-icons@14.0.0: + resolution: {integrity: sha512-29qvtBEvo+xuGxMooUWHEgp7ZvaRrkgPwLdg/B909T1/uoYiUrekOqBRZywAvV2JRlxLUjB6e1gWgtWup7R18Q==} engines: {node: '>=0.12.18'} sisteransi@1.0.5: @@ -2467,11 +2603,11 @@ packages: resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==} engines: {node: '>=14.0.0'} - tldts-core@6.1.65: - resolution: {integrity: sha512-Uq5t0N0Oj4nQSbU8wFN1YYENvMthvwU13MQrMJRspYCGLSAZjAfoBOJki5IQpnBM/WFskxxC/gIOTwaedmHaSg==} + tldts-core@6.1.69: + resolution: {integrity: sha512-nygxy9n2PBUFQUtAXAc122gGo+04/j5qr5TGQFZTHafTKYvmARVXt2cA5rgero2/dnXUfkdPtiJoKmrd3T+wdA==} - tldts@6.1.65: - resolution: {integrity: sha512-xU9gLTfAGsADQ2PcWee6Hg8RFAv0DnjMGVJmDnUmI8a9+nYmapMQix4afwrdaCtT+AqP4MaxEzu7cCrYmBPbzQ==} + tldts@6.1.69: + resolution: {integrity: sha512-Oh/CqRQ1NXNY7cy9NkTPUauOWiTro0jEYZTioGbOmcQh6EC45oribyIMJp0OJO3677r13tO6SKdWoGZUx2BDFw==} hasBin: true to-regex-range@5.0.1: @@ -2515,8 +2651,8 @@ packages: resolution: {integrity: sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==} engines: {node: '>=8'} - typescript@5.6.3: - resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} + typescript@5.7.2: + resolution: {integrity: sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==} engines: {node: '>=14.17'} hasBin: true @@ -2561,9 +2697,9 @@ packages: validate-npm-package-license@3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} - vite-node@2.1.6: - resolution: {integrity: sha512-DBfJY0n9JUwnyLxPSSUmEePT21j8JZp/sR9n+/gBwQU6DcQOioPdb8/pibWfXForbirSagZCilseYIwaL3f95A==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} + vite-node@2.1.8: + resolution: {integrity: sha512-uPAwSr57kYjAUux+8E2j0q0Fxpn8M9VoyfGiRI8Kfktz9NcYMCenwY5RnZxnF1WTu3TGiYipirIzacLL3VVGFg==} + engines: {node: ^18.0.0 || >=20.0.0} hasBin: true vite-plugin-prismjs@0.0.11: @@ -2580,8 +2716,39 @@ packages: peerDependencies: vue: '>=3.2.13' - vite@6.0.2: - resolution: {integrity: sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==} + vite@5.4.11: + resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + sass-embedded: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + sass-embedded: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + + vite@6.0.6: + resolution: {integrity: sha512-NSjmUuckPmDU18bHz7QZ+bTYhRR0iA72cs2QAxCqDpafJ0S6qetco0LB3WW2OxlMHS0JmAv+yZ/R3uPmMyGTjQ==} engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} hasBin: true peerDependencies: @@ -2620,15 +2787,15 @@ packages: yaml: optional: true - vitest@2.1.6: - resolution: {integrity: sha512-isUCkvPL30J4c5O5hgONeFRsDmlw6kzFEdLQHLezmDdKQHy8Ke/B/dgdTMEgU0vm+iZ0TjW8GuK83DiahBoKWQ==} - engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0} + vitest@2.1.8: + resolution: {integrity: sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==} + engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: '@edge-runtime/vm': '*' - '@types/node': ^18.0.0 || ^20.0.0 || >=22.0.0 - '@vitest/browser': 2.1.6 - '@vitest/ui': 2.1.6 + '@types/node': ^18.0.0 || >=20.0.0 + '@vitest/browser': 2.1.8 + '@vitest/ui': 2.1.8 happy-dom: '*' jsdom: '*' peerDependenciesMeta: @@ -2648,8 +2815,8 @@ packages: vscode-uri@3.0.8: resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==} - vue-component-type-helpers@2.1.10: - resolution: {integrity: sha512-lfgdSLQKrUmADiSV6PbBvYgQ33KF3Ztv6gP85MfGaGaSGMTXORVaHT1EHfsqCgzRNBstPKYDmvAV9Do5CmJ07A==} + vue-component-type-helpers@2.2.0: + resolution: {integrity: sha512-cYrAnv2me7bPDcg9kIcGwjJiSB6Qyi08+jLDo9yuvoFQjzHiPTzML7RnkJB1+3P6KMsX/KbCD4QE3Tv/knEllw==} vue-demi@0.14.10: resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==} @@ -2668,8 +2835,8 @@ packages: peerDependencies: eslint: '>=6.0.0' - vue-i18n@10.0.5: - resolution: {integrity: sha512-9/gmDlCblz3i8ypu/afiIc/SUIfTTE1mr0mZhb9pk70xo2csHAM9mp2gdQ3KD2O0AM3Hz/5ypb+FycTj/lHlPQ==} + vue-i18n@11.0.1: + resolution: {integrity: sha512-pWAT8CusK8q9/EpN7V3oxwHwxWm6+Kp2PeTZmRGvdZTkUzMQDpbbmHp0TwQ8xw04XKm23cr6B4GL72y3W8Yekg==} engines: {node: '>= 16'} peerDependencies: vue: ^3.0.0 @@ -2679,8 +2846,8 @@ packages: peerDependencies: vue: ^3.2.0 - vue-tsc@2.1.10: - resolution: {integrity: sha512-RBNSfaaRHcN5uqVqJSZh++Gy/YUzryuv9u1aFWhsammDJXNtUiJMNoJ747lZcQ68wUQFx6E73y4FY3D8E7FGMA==} + vue-tsc@2.2.0: + resolution: {integrity: sha512-gtmM1sUuJ8aSb0KoAFmK9yMxb8TxjewmxqTJ1aKphD5Cbu0rULFY6+UQT51zW7SpUcenfPUuflKyVwyx9Qdnxg==} hasBin: true peerDependencies: typescript: '>=5.0.0' @@ -2712,8 +2879,8 @@ packages: resolution: {integrity: sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==} engines: {node: '>=18'} - whatwg-url@14.0.0: - resolution: {integrity: sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==} + whatwg-url@14.1.0: + resolution: {integrity: sha512-jlf/foYIKywAt3x/XWKZ/3rz8OSJPiWktjmk891alJUEjiVxKX9LEO92qH3hv4aJ0mN3MWPvGMCy8jQi95xK4w==} engines: {node: '>=18'} which@2.0.2: @@ -2804,45 +2971,45 @@ snapshots: '@ampproject/remapping@2.3.0': dependencies: - '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/gen-mapping': 0.3.8 '@jridgewell/trace-mapping': 0.3.25 - '@antfu/eslint-config@3.11.2(@typescript-eslint/utils@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(@vue/compiler-sfc@3.5.13)(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3)(vitest@2.1.6(@types/node@22.10.1)(jiti@1.21.6)(jsdom@25.0.1)(stylus@0.57.0)(yaml@2.6.1))': + '@antfu/eslint-config@3.12.1(@typescript-eslint/utils@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(@vue/compiler-sfc@3.5.13)(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2)(vitest@2.1.8(@types/node@22.10.2)(jsdom@25.0.1)(stylus@0.57.0))': dependencies: '@antfu/install-pkg': 0.5.0 - '@clack/prompts': 0.8.2 - '@eslint-community/eslint-plugin-eslint-comments': 4.4.1(eslint@9.16.0(jiti@1.21.6)) + '@clack/prompts': 0.9.0 + '@eslint-community/eslint-plugin-eslint-comments': 4.4.1(eslint@9.17.0(jiti@1.21.7)) '@eslint/markdown': 6.2.1 - '@stylistic/eslint-plugin': 2.11.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - '@typescript-eslint/eslint-plugin': 8.16.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - '@typescript-eslint/parser': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - '@vitest/eslint-plugin': 1.1.13(@typescript-eslint/utils@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3)(vitest@2.1.6(@types/node@22.10.1)(jiti@1.21.6)(jsdom@25.0.1)(stylus@0.57.0)(yaml@2.6.1)) - eslint: 9.16.0(jiti@1.21.6) - eslint-config-flat-gitignore: 0.3.0(eslint@9.16.0(jiti@1.21.6)) + '@stylistic/eslint-plugin': 2.12.1(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + '@typescript-eslint/eslint-plugin': 8.18.2(@typescript-eslint/parser@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + '@typescript-eslint/parser': 8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + '@vitest/eslint-plugin': 1.1.20(@typescript-eslint/utils@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2)(vitest@2.1.8(@types/node@22.10.2)(jsdom@25.0.1)(stylus@0.57.0)) + eslint: 9.17.0(jiti@1.21.7) + eslint-config-flat-gitignore: 0.3.0(eslint@9.17.0(jiti@1.21.7)) eslint-flat-config-utils: 0.4.0 - eslint-merge-processors: 0.1.0(eslint@9.16.0(jiti@1.21.6)) - eslint-plugin-antfu: 2.7.0(eslint@9.16.0(jiti@1.21.6)) - eslint-plugin-command: 0.2.6(eslint@9.16.0(jiti@1.21.6)) - eslint-plugin-import-x: 4.4.3(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - eslint-plugin-jsdoc: 50.6.0(eslint@9.16.0(jiti@1.21.6)) - eslint-plugin-jsonc: 2.18.2(eslint@9.16.0(jiti@1.21.6)) - eslint-plugin-n: 17.14.0(eslint@9.16.0(jiti@1.21.6)) + eslint-merge-processors: 0.1.0(eslint@9.17.0(jiti@1.21.7)) + eslint-plugin-antfu: 2.7.0(eslint@9.17.0(jiti@1.21.7)) + eslint-plugin-command: 0.2.7(eslint@9.17.0(jiti@1.21.7)) + eslint-plugin-import-x: 4.6.1(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + eslint-plugin-jsdoc: 50.6.1(eslint@9.17.0(jiti@1.21.7)) + eslint-plugin-jsonc: 2.18.2(eslint@9.17.0(jiti@1.21.7)) + eslint-plugin-n: 17.15.1(eslint@9.17.0(jiti@1.21.7)) eslint-plugin-no-only-tests: 3.3.0 - eslint-plugin-perfectionist: 4.1.2(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - eslint-plugin-regexp: 2.7.0(eslint@9.16.0(jiti@1.21.6)) - eslint-plugin-toml: 0.11.1(eslint@9.16.0(jiti@1.21.6)) - eslint-plugin-unicorn: 56.0.1(eslint@9.16.0(jiti@1.21.6)) - eslint-plugin-unused-imports: 4.1.4(@typescript-eslint/eslint-plugin@8.16.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.16.0(jiti@1.21.6)) - eslint-plugin-vue: 9.32.0(eslint@9.16.0(jiti@1.21.6)) - eslint-plugin-yml: 1.16.0(eslint@9.16.0(jiti@1.21.6)) - eslint-processor-vue-blocks: 0.1.2(@vue/compiler-sfc@3.5.13)(eslint@9.16.0(jiti@1.21.6)) - globals: 15.13.0 + eslint-plugin-perfectionist: 4.4.0(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + eslint-plugin-regexp: 2.7.0(eslint@9.17.0(jiti@1.21.7)) + eslint-plugin-toml: 0.12.0(eslint@9.17.0(jiti@1.21.7)) + eslint-plugin-unicorn: 56.0.1(eslint@9.17.0(jiti@1.21.7)) + eslint-plugin-unused-imports: 4.1.4(@typescript-eslint/eslint-plugin@8.18.2(@typescript-eslint/parser@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(eslint@9.17.0(jiti@1.21.7)) + eslint-plugin-vue: 9.32.0(eslint@9.17.0(jiti@1.21.7)) + eslint-plugin-yml: 1.16.0(eslint@9.17.0(jiti@1.21.7)) + eslint-processor-vue-blocks: 0.1.2(@vue/compiler-sfc@3.5.13)(eslint@9.17.0(jiti@1.21.7)) + globals: 15.14.0 jsonc-eslint-parser: 2.4.0 local-pkg: 0.5.1 parse-gitignore: 2.0.0 picocolors: 1.1.1 toml-eslint-parser: 0.10.0 - vue-eslint-parser: 9.4.3(eslint@9.16.0(jiti@1.21.6)) + vue-eslint-parser: 9.4.3(eslint@9.17.0(jiti@1.21.7)) yaml-eslint-parser: 1.2.3 yargs: 17.7.2 transitivePeerDependencies: @@ -2855,7 +3022,7 @@ snapshots: '@antfu/install-pkg@0.5.0': dependencies: - package-manager-detector: 0.2.6 + package-manager-detector: 0.2.8 tinyexec: 0.3.1 '@antfu/utils@0.7.10': {} @@ -2866,48 +3033,48 @@ snapshots: js-tokens: 4.0.0 picocolors: 1.1.1 - '@babel/compat-data@7.26.2': {} + '@babel/compat-data@7.26.3': {} '@babel/core@7.26.0': dependencies: '@ampproject/remapping': 2.3.0 '@babel/code-frame': 7.26.2 - '@babel/generator': 7.26.2 + '@babel/generator': 7.26.3 '@babel/helper-compilation-targets': 7.25.9 '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0) '@babel/helpers': 7.26.0 - '@babel/parser': 7.26.2 + '@babel/parser': 7.26.3 '@babel/template': 7.25.9 - '@babel/traverse': 7.25.9 - '@babel/types': 7.26.0 + '@babel/traverse': 7.26.4 + '@babel/types': 7.26.3 convert-source-map: 2.0.0 - debug: 4.3.7 + debug: 4.4.0 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 7.6.3 transitivePeerDependencies: - supports-color - '@babel/generator@7.26.2': + '@babel/generator@7.26.3': dependencies: - '@babel/parser': 7.26.2 - '@babel/types': 7.26.0 - '@jridgewell/gen-mapping': 0.3.5 + '@babel/parser': 7.26.3 + '@babel/types': 7.26.3 + '@jridgewell/gen-mapping': 0.3.8 '@jridgewell/trace-mapping': 0.3.25 - jsesc: 3.0.2 + jsesc: 3.1.0 '@babel/helper-compilation-targets@7.25.9': dependencies: - '@babel/compat-data': 7.26.2 + '@babel/compat-data': 7.26.3 '@babel/helper-validator-option': 7.25.9 - browserslist: 4.24.2 + browserslist: 4.24.3 lru-cache: 5.1.1 semver: 7.6.3 '@babel/helper-module-imports@7.25.9': dependencies: - '@babel/traverse': 7.25.9 - '@babel/types': 7.26.0 + '@babel/traverse': 7.26.4 + '@babel/types': 7.26.3 transitivePeerDependencies: - supports-color @@ -2916,7 +3083,7 @@ snapshots: '@babel/core': 7.26.0 '@babel/helper-module-imports': 7.25.9 '@babel/helper-validator-identifier': 7.25.9 - '@babel/traverse': 7.25.9 + '@babel/traverse': 7.26.4 transitivePeerDependencies: - supports-color @@ -2929,11 +3096,11 @@ snapshots: '@babel/helpers@7.26.0': dependencies: '@babel/template': 7.25.9 - '@babel/types': 7.26.0 + '@babel/types': 7.26.3 - '@babel/parser@7.26.2': + '@babel/parser@7.26.3': dependencies: - '@babel/types': 7.26.0 + '@babel/types': 7.26.3 '@babel/runtime@7.26.0': dependencies: @@ -2942,152 +3109,220 @@ snapshots: '@babel/template@7.25.9': dependencies: '@babel/code-frame': 7.26.2 - '@babel/parser': 7.26.2 - '@babel/types': 7.26.0 + '@babel/parser': 7.26.3 + '@babel/types': 7.26.3 - '@babel/traverse@7.25.9': + '@babel/traverse@7.26.4': dependencies: '@babel/code-frame': 7.26.2 - '@babel/generator': 7.26.2 - '@babel/parser': 7.26.2 + '@babel/generator': 7.26.3 + '@babel/parser': 7.26.3 '@babel/template': 7.25.9 - '@babel/types': 7.26.0 - debug: 4.3.7 + '@babel/types': 7.26.3 + debug: 4.4.0 globals: 11.12.0 transitivePeerDependencies: - supports-color - '@babel/types@7.26.0': + '@babel/types@7.26.3': dependencies: '@babel/helper-string-parser': 7.25.9 '@babel/helper-validator-identifier': 7.25.9 - '@clack/core@0.3.5': + '@clack/core@0.4.0': dependencies: picocolors: 1.1.1 sisteransi: 1.0.5 - '@clack/prompts@0.8.2': + '@clack/prompts@0.9.0': dependencies: - '@clack/core': 0.3.5 + '@clack/core': 0.4.0 picocolors: 1.1.1 sisteransi: 1.0.5 - '@es-joy/jsdoccomment@0.48.0': - dependencies: - comment-parser: 1.4.1 - esquery: 1.6.0 - jsdoc-type-pratt-parser: 4.1.0 - '@es-joy/jsdoccomment@0.49.0': dependencies: comment-parser: 1.4.1 esquery: 1.6.0 jsdoc-type-pratt-parser: 4.1.0 - '@esbuild/aix-ppc64@0.24.0': + '@esbuild/aix-ppc64@0.21.5': optional: true - '@esbuild/android-arm64@0.24.0': + '@esbuild/aix-ppc64@0.24.2': optional: true - '@esbuild/android-arm@0.24.0': + '@esbuild/android-arm64@0.21.5': optional: true - '@esbuild/android-x64@0.24.0': + '@esbuild/android-arm64@0.24.2': optional: true - '@esbuild/darwin-arm64@0.24.0': + '@esbuild/android-arm@0.21.5': optional: true - '@esbuild/darwin-x64@0.24.0': + '@esbuild/android-arm@0.24.2': optional: true - '@esbuild/freebsd-arm64@0.24.0': + '@esbuild/android-x64@0.21.5': optional: true - '@esbuild/freebsd-x64@0.24.0': + '@esbuild/android-x64@0.24.2': optional: true - '@esbuild/linux-arm64@0.24.0': + '@esbuild/darwin-arm64@0.21.5': optional: true - '@esbuild/linux-arm@0.24.0': + '@esbuild/darwin-arm64@0.24.2': optional: true - '@esbuild/linux-ia32@0.24.0': + '@esbuild/darwin-x64@0.21.5': optional: true - '@esbuild/linux-loong64@0.24.0': + '@esbuild/darwin-x64@0.24.2': optional: true - '@esbuild/linux-mips64el@0.24.0': + '@esbuild/freebsd-arm64@0.21.5': optional: true - '@esbuild/linux-ppc64@0.24.0': + '@esbuild/freebsd-arm64@0.24.2': optional: true - '@esbuild/linux-riscv64@0.24.0': + '@esbuild/freebsd-x64@0.21.5': optional: true - '@esbuild/linux-s390x@0.24.0': + '@esbuild/freebsd-x64@0.24.2': optional: true - '@esbuild/linux-x64@0.24.0': + '@esbuild/linux-arm64@0.21.5': optional: true - '@esbuild/netbsd-x64@0.24.0': + '@esbuild/linux-arm64@0.24.2': optional: true - '@esbuild/openbsd-arm64@0.24.0': + '@esbuild/linux-arm@0.21.5': optional: true - '@esbuild/openbsd-x64@0.24.0': + '@esbuild/linux-arm@0.24.2': optional: true - '@esbuild/sunos-x64@0.24.0': + '@esbuild/linux-ia32@0.21.5': optional: true - '@esbuild/win32-arm64@0.24.0': + '@esbuild/linux-ia32@0.24.2': optional: true - '@esbuild/win32-ia32@0.24.0': + '@esbuild/linux-loong64@0.21.5': optional: true - '@esbuild/win32-x64@0.24.0': + '@esbuild/linux-loong64@0.24.2': optional: true - '@eslint-community/eslint-plugin-eslint-comments@4.4.1(eslint@9.16.0(jiti@1.21.6))': + '@esbuild/linux-mips64el@0.21.5': + optional: true + + '@esbuild/linux-mips64el@0.24.2': + optional: true + + '@esbuild/linux-ppc64@0.21.5': + optional: true + + '@esbuild/linux-ppc64@0.24.2': + optional: true + + '@esbuild/linux-riscv64@0.21.5': + optional: true + + '@esbuild/linux-riscv64@0.24.2': + optional: true + + '@esbuild/linux-s390x@0.21.5': + optional: true + + '@esbuild/linux-s390x@0.24.2': + optional: true + + '@esbuild/linux-x64@0.21.5': + optional: true + + '@esbuild/linux-x64@0.24.2': + optional: true + + '@esbuild/netbsd-arm64@0.24.2': + optional: true + + '@esbuild/netbsd-x64@0.21.5': + optional: true + + '@esbuild/netbsd-x64@0.24.2': + optional: true + + '@esbuild/openbsd-arm64@0.24.2': + optional: true + + '@esbuild/openbsd-x64@0.21.5': + optional: true + + '@esbuild/openbsd-x64@0.24.2': + optional: true + + '@esbuild/sunos-x64@0.21.5': + optional: true + + '@esbuild/sunos-x64@0.24.2': + optional: true + + '@esbuild/win32-arm64@0.21.5': + optional: true + + '@esbuild/win32-arm64@0.24.2': + optional: true + + '@esbuild/win32-ia32@0.21.5': + optional: true + + '@esbuild/win32-ia32@0.24.2': + optional: true + + '@esbuild/win32-x64@0.21.5': + optional: true + + '@esbuild/win32-x64@0.24.2': + optional: true + + '@eslint-community/eslint-plugin-eslint-comments@4.4.1(eslint@9.17.0(jiti@1.21.7))': dependencies: escape-string-regexp: 4.0.0 - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) ignore: 5.3.2 - '@eslint-community/eslint-utils@4.4.1(eslint@9.16.0(jiti@1.21.6))': + '@eslint-community/eslint-utils@4.4.1(eslint@9.17.0(jiti@1.21.7))': dependencies: - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.12.1': {} - '@eslint/compat@1.2.3(eslint@9.16.0(jiti@1.21.6))': + '@eslint/compat@1.2.4(eslint@9.17.0(jiti@1.21.7))': optionalDependencies: - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) - '@eslint/config-array@0.19.0': + '@eslint/config-array@0.19.1': dependencies: - '@eslint/object-schema': 2.1.4 - debug: 4.3.7 + '@eslint/object-schema': 2.1.5 + debug: 4.4.0 minimatch: 3.1.2 transitivePeerDependencies: - supports-color - '@eslint/core@0.9.0': {} + '@eslint/core@0.9.1': + dependencies: + '@types/json-schema': 7.0.15 '@eslint/eslintrc@3.2.0': dependencies: ajv: 6.12.6 - debug: 4.3.7 + debug: 4.4.0 espree: 10.3.0 globals: 14.0.0 ignore: 5.3.2 @@ -3098,20 +3333,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@eslint/js@9.16.0': {} + '@eslint/js@9.17.0': {} '@eslint/markdown@6.2.1': dependencies: - '@eslint/plugin-kit': 0.2.3 + '@eslint/plugin-kit': 0.2.4 mdast-util-from-markdown: 2.0.2 mdast-util-gfm: 3.0.0 micromark-extension-gfm: 3.0.0 transitivePeerDependencies: - supports-color - '@eslint/object-schema@2.1.4': {} + '@eslint/object-schema@2.1.5': {} - '@eslint/plugin-kit@0.2.3': + '@eslint/plugin-kit@0.2.4': dependencies: levn: 0.4.1 @@ -3128,23 +3363,23 @@ snapshots: '@humanwhocodes/retry@0.4.1': {} - '@ianvs/prettier-plugin-sort-imports@4.4.0(@vue/compiler-sfc@3.5.13)(prettier@3.4.1)': + '@ianvs/prettier-plugin-sort-imports@4.4.0(@vue/compiler-sfc@3.5.13)(prettier@3.4.2)': dependencies: - '@babel/generator': 7.26.2 - '@babel/parser': 7.26.2 - '@babel/traverse': 7.25.9 - '@babel/types': 7.26.0 - prettier: 3.4.1 + '@babel/generator': 7.26.3 + '@babel/parser': 7.26.3 + '@babel/traverse': 7.26.4 + '@babel/types': 7.26.3 + prettier: 3.4.2 semver: 7.6.3 optionalDependencies: '@vue/compiler-sfc': 3.5.13 transitivePeerDependencies: - supports-color - '@intlify/bundle-utils@10.0.0(vue-i18n@10.0.5(vue@3.5.13(typescript@5.6.3)))': + '@intlify/bundle-utils@10.0.0(vue-i18n@11.0.1(vue@3.5.13(typescript@5.7.2)))': dependencies: - '@intlify/message-compiler': 11.0.0-beta.2 - '@intlify/shared': 11.0.0-beta.2 + '@intlify/message-compiler': 11.0.0-rc.1 + '@intlify/shared': 11.0.0-rc.1 acorn: 8.14.0 escodegen: 2.1.0 estree-walker: 2.0.2 @@ -3153,28 +3388,28 @@ snapshots: source-map-js: 1.2.1 yaml-eslint-parser: 1.2.3 optionalDependencies: - vue-i18n: 10.0.5(vue@3.5.13(typescript@5.6.3)) + vue-i18n: 11.0.1(vue@3.5.13(typescript@5.7.2)) - '@intlify/core-base@10.0.5': + '@intlify/core-base@11.0.1': dependencies: - '@intlify/message-compiler': 10.0.5 - '@intlify/shared': 10.0.5 + '@intlify/message-compiler': 11.0.1 + '@intlify/shared': 11.0.1 '@intlify/core-base@9.14.2': dependencies: '@intlify/message-compiler': 9.14.2 '@intlify/shared': 9.14.2 - '@intlify/eslint-plugin-vue-i18n@3.1.0(eslint@9.16.0(jiti@1.21.6))': + '@intlify/eslint-plugin-vue-i18n@3.2.0(eslint@9.17.0(jiti@1.21.7))': dependencies: '@eslint/eslintrc': 3.2.0 '@intlify/core-base': 9.14.2 '@intlify/message-compiler': 9.14.2 - debug: 4.3.7 - eslint: 9.16.0(jiti@1.21.6) - eslint-compat-utils: 0.6.4(eslint@9.16.0(jiti@1.21.6)) + debug: 4.4.0 + eslint: 9.17.0(jiti@1.21.7) + eslint-compat-utils: 0.6.4(eslint@9.17.0(jiti@1.21.7)) glob: 10.4.5 - globals: 15.13.0 + globals: 15.14.0 ignore: 6.0.2 import-fresh: 3.3.0 is-language-code: 3.1.0 @@ -3185,19 +3420,19 @@ snapshots: parse5: 7.2.1 semver: 7.6.3 synckit: 0.9.2 - vue-eslint-parser: 9.4.3(eslint@9.16.0(jiti@1.21.6)) + vue-eslint-parser: 9.4.3(eslint@9.17.0(jiti@1.21.7)) yaml-eslint-parser: 1.2.3 transitivePeerDependencies: - supports-color - '@intlify/message-compiler@10.0.5': + '@intlify/message-compiler@11.0.0-rc.1': dependencies: - '@intlify/shared': 10.0.5 + '@intlify/shared': 11.0.0-rc.1 source-map-js: 1.2.1 - '@intlify/message-compiler@11.0.0-beta.2': + '@intlify/message-compiler@11.0.1': dependencies: - '@intlify/shared': 11.0.0-beta.2 + '@intlify/shared': 11.0.1 source-map-js: 1.2.1 '@intlify/message-compiler@9.14.2': @@ -3205,22 +3440,22 @@ snapshots: '@intlify/shared': 9.14.2 source-map-js: 1.2.1 - '@intlify/shared@10.0.5': {} + '@intlify/shared@11.0.0-rc.1': {} - '@intlify/shared@11.0.0-beta.2': {} + '@intlify/shared@11.0.1': {} '@intlify/shared@9.14.2': {} - '@intlify/unplugin-vue-i18n@6.0.0(@vue/compiler-dom@3.5.13)(eslint@9.16.0(jiti@1.21.6))(rollup@4.28.0)(typescript@5.6.3)(vue-i18n@10.0.5(vue@3.5.13(typescript@5.6.3)))(vue@3.5.13(typescript@5.6.3))': + '@intlify/unplugin-vue-i18n@6.0.2(@vue/compiler-dom@3.5.13)(eslint@9.17.0(jiti@1.21.7))(rollup@4.29.1)(typescript@5.7.2)(vue-i18n@11.0.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))': dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) - '@intlify/bundle-utils': 10.0.0(vue-i18n@10.0.5(vue@3.5.13(typescript@5.6.3))) - '@intlify/shared': 10.0.5 - '@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@10.0.5)(@vue/compiler-dom@3.5.13)(vue-i18n@10.0.5(vue@3.5.13(typescript@5.6.3)))(vue@3.5.13(typescript@5.6.3)) - '@rollup/pluginutils': 5.1.3(rollup@4.28.0) - '@typescript-eslint/scope-manager': 8.16.0 - '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.6.3) - debug: 4.3.7 + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) + '@intlify/bundle-utils': 10.0.0(vue-i18n@11.0.1(vue@3.5.13(typescript@5.7.2))) + '@intlify/shared': 11.0.1 + '@intlify/vue-i18n-extensions': 7.0.0(@intlify/shared@11.0.1)(@vue/compiler-dom@3.5.13)(vue-i18n@11.0.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2)) + '@rollup/pluginutils': 5.1.4(rollup@4.29.1) + '@typescript-eslint/scope-manager': 8.18.2 + '@typescript-eslint/typescript-estree': 8.18.2(typescript@5.7.2) + debug: 4.4.0 fast-glob: 3.3.2 js-yaml: 4.1.0 json5: 2.2.3 @@ -3228,9 +3463,9 @@ snapshots: picocolors: 1.1.1 source-map-js: 1.2.1 unplugin: 1.16.0 - vue: 3.5.13(typescript@5.6.3) + vue: 3.5.13(typescript@5.7.2) optionalDependencies: - vue-i18n: 10.0.5(vue@3.5.13(typescript@5.6.3)) + vue-i18n: 11.0.1(vue@3.5.13(typescript@5.7.2)) transitivePeerDependencies: - '@vue/compiler-dom' - eslint @@ -3238,14 +3473,14 @@ snapshots: - supports-color - typescript - '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@10.0.5)(@vue/compiler-dom@3.5.13)(vue-i18n@10.0.5(vue@3.5.13(typescript@5.6.3)))(vue@3.5.13(typescript@5.6.3))': + '@intlify/vue-i18n-extensions@7.0.0(@intlify/shared@11.0.1)(@vue/compiler-dom@3.5.13)(vue-i18n@11.0.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))': dependencies: - '@babel/parser': 7.26.2 + '@babel/parser': 7.26.3 optionalDependencies: - '@intlify/shared': 10.0.5 + '@intlify/shared': 11.0.1 '@vue/compiler-dom': 3.5.13 - vue: 3.5.13(typescript@5.6.3) - vue-i18n: 10.0.5(vue@3.5.13(typescript@5.6.3)) + vue: 3.5.13(typescript@5.7.2) + vue-i18n: 11.0.1(vue@3.5.13(typescript@5.7.2)) '@isaacs/cliui@8.0.2': dependencies: @@ -3256,7 +3491,7 @@ snapshots: wrap-ansi: 8.1.0 wrap-ansi-cjs: wrap-ansi@7.0.0 - '@jridgewell/gen-mapping@0.3.5': + '@jridgewell/gen-mapping@0.3.8': dependencies: '@jridgewell/set-array': 1.2.1 '@jridgewell/sourcemap-codec': 1.5.0 @@ -3273,9 +3508,9 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 - '@kyvg/vue3-notification@3.4.1(vue@3.5.13(typescript@5.6.3))': + '@kyvg/vue3-notification@3.4.1(vue@3.5.13(typescript@5.7.2))': dependencies: - vue: 3.5.13(typescript@5.6.3) + vue: 3.5.13(typescript@5.7.2) '@mdi/js@7.4.47': {} @@ -3289,7 +3524,7 @@ snapshots: '@nodelib/fs.walk@1.2.8': dependencies: '@nodelib/fs.scandir': 2.1.5 - fastq: 1.17.1 + fastq: 1.18.0 '@one-ini/wasm@0.1.1': {} @@ -3298,74 +3533,77 @@ snapshots: '@pkgr/core@0.1.1': {} - '@rollup/pluginutils@5.1.3(rollup@4.28.0)': + '@rollup/pluginutils@5.1.4(rollup@4.29.1)': dependencies: '@types/estree': 1.0.6 estree-walker: 2.0.2 picomatch: 4.0.2 optionalDependencies: - rollup: 4.28.0 + rollup: 4.29.1 - '@rollup/rollup-android-arm-eabi@4.28.0': + '@rollup/rollup-android-arm-eabi@4.29.1': optional: true - '@rollup/rollup-android-arm64@4.28.0': + '@rollup/rollup-android-arm64@4.29.1': optional: true - '@rollup/rollup-darwin-arm64@4.28.0': + '@rollup/rollup-darwin-arm64@4.29.1': optional: true - '@rollup/rollup-darwin-x64@4.28.0': + '@rollup/rollup-darwin-x64@4.29.1': optional: true - '@rollup/rollup-freebsd-arm64@4.28.0': + '@rollup/rollup-freebsd-arm64@4.29.1': optional: true - '@rollup/rollup-freebsd-x64@4.28.0': + '@rollup/rollup-freebsd-x64@4.29.1': optional: true - '@rollup/rollup-linux-arm-gnueabihf@4.28.0': + '@rollup/rollup-linux-arm-gnueabihf@4.29.1': optional: true - '@rollup/rollup-linux-arm-musleabihf@4.28.0': + '@rollup/rollup-linux-arm-musleabihf@4.29.1': optional: true - '@rollup/rollup-linux-arm64-gnu@4.28.0': + '@rollup/rollup-linux-arm64-gnu@4.29.1': optional: true - '@rollup/rollup-linux-arm64-musl@4.28.0': + '@rollup/rollup-linux-arm64-musl@4.29.1': optional: true - '@rollup/rollup-linux-powerpc64le-gnu@4.28.0': + '@rollup/rollup-linux-loongarch64-gnu@4.29.1': optional: true - '@rollup/rollup-linux-riscv64-gnu@4.28.0': + '@rollup/rollup-linux-powerpc64le-gnu@4.29.1': optional: true - '@rollup/rollup-linux-s390x-gnu@4.28.0': + '@rollup/rollup-linux-riscv64-gnu@4.29.1': optional: true - '@rollup/rollup-linux-x64-gnu@4.28.0': + '@rollup/rollup-linux-s390x-gnu@4.29.1': optional: true - '@rollup/rollup-linux-x64-musl@4.28.0': + '@rollup/rollup-linux-x64-gnu@4.29.1': optional: true - '@rollup/rollup-win32-arm64-msvc@4.28.0': + '@rollup/rollup-linux-x64-musl@4.29.1': optional: true - '@rollup/rollup-win32-ia32-msvc@4.28.0': + '@rollup/rollup-win32-arm64-msvc@4.29.1': optional: true - '@rollup/rollup-win32-x64-msvc@4.28.0': + '@rollup/rollup-win32-ia32-msvc@4.29.1': + optional: true + + '@rollup/rollup-win32-x64-msvc@4.29.1': optional: true '@sindresorhus/is@4.6.0': {} - '@stylistic/eslint-plugin@2.11.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3)': + '@stylistic/eslint-plugin@2.12.1(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2)': dependencies: - '@typescript-eslint/utils': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - eslint: 9.16.0(jiti@1.21.6) + '@typescript-eslint/utils': 8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + eslint: 9.17.0(jiti@1.21.7) eslint-visitor-keys: 4.2.0 espree: 10.3.0 estraverse: 5.3.0 @@ -3380,6 +3618,8 @@ snapshots: dependencies: '@types/ms': 0.7.34 + '@types/doctrine@0.0.9': {} + '@types/eslint@9.6.1': dependencies: '@types/estree': 1.0.6 @@ -3401,7 +3641,7 @@ snapshots: '@types/ms@0.7.34': {} - '@types/node@22.10.1': + '@types/node@22.10.2': dependencies: undici-types: 6.20.0 @@ -3420,156 +3660,151 @@ snapshots: '@types/web-bluetooth@0.0.20': {} - '@typescript-eslint/eslint-plugin@8.16.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3)': + '@typescript-eslint/eslint-plugin@8.18.2(@typescript-eslint/parser@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2)': dependencies: '@eslint-community/regexpp': 4.12.1 - '@typescript-eslint/parser': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - '@typescript-eslint/scope-manager': 8.16.0 - '@typescript-eslint/type-utils': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - '@typescript-eslint/utils': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.16.0 - eslint: 9.16.0(jiti@1.21.6) + '@typescript-eslint/parser': 8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + '@typescript-eslint/scope-manager': 8.18.2 + '@typescript-eslint/type-utils': 8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + '@typescript-eslint/utils': 8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + '@typescript-eslint/visitor-keys': 8.18.2 + eslint: 9.17.0(jiti@1.21.7) graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.4.3(typescript@5.6.3) - optionalDependencies: - typescript: 5.6.3 + ts-api-utils: 1.4.3(typescript@5.7.2) + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3)': + '@typescript-eslint/parser@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2)': dependencies: - '@typescript-eslint/scope-manager': 8.16.0 - '@typescript-eslint/types': 8.16.0 - '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.6.3) - '@typescript-eslint/visitor-keys': 8.16.0 - debug: 4.3.7 - eslint: 9.16.0(jiti@1.21.6) - optionalDependencies: - typescript: 5.6.3 + '@typescript-eslint/scope-manager': 8.18.2 + '@typescript-eslint/types': 8.18.2 + '@typescript-eslint/typescript-estree': 8.18.2(typescript@5.7.2) + '@typescript-eslint/visitor-keys': 8.18.2 + debug: 4.4.0 + eslint: 9.17.0(jiti@1.21.7) + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.16.0': + '@typescript-eslint/scope-manager@8.18.2': dependencies: - '@typescript-eslint/types': 8.16.0 - '@typescript-eslint/visitor-keys': 8.16.0 + '@typescript-eslint/types': 8.18.2 + '@typescript-eslint/visitor-keys': 8.18.2 - '@typescript-eslint/type-utils@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3)': + '@typescript-eslint/type-utils@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2)': dependencies: - '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.6.3) - '@typescript-eslint/utils': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - debug: 4.3.7 - eslint: 9.16.0(jiti@1.21.6) - ts-api-utils: 1.4.3(typescript@5.6.3) - optionalDependencies: - typescript: 5.6.3 + '@typescript-eslint/typescript-estree': 8.18.2(typescript@5.7.2) + '@typescript-eslint/utils': 8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + debug: 4.4.0 + eslint: 9.17.0(jiti@1.21.7) + ts-api-utils: 1.4.3(typescript@5.7.2) + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/types@8.16.0': {} + '@typescript-eslint/types@8.18.2': {} - '@typescript-eslint/typescript-estree@8.16.0(typescript@5.6.3)': + '@typescript-eslint/typescript-estree@8.18.2(typescript@5.7.2)': dependencies: - '@typescript-eslint/types': 8.16.0 - '@typescript-eslint/visitor-keys': 8.16.0 - debug: 4.3.7 + '@typescript-eslint/types': 8.18.2 + '@typescript-eslint/visitor-keys': 8.18.2 + debug: 4.4.0 fast-glob: 3.3.2 is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.4.3(typescript@5.6.3) - optionalDependencies: - typescript: 5.6.3 + ts-api-utils: 1.4.3(typescript@5.7.2) + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3)': + '@typescript-eslint/utils@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) - '@typescript-eslint/scope-manager': 8.16.0 - '@typescript-eslint/types': 8.16.0 - '@typescript-eslint/typescript-estree': 8.16.0(typescript@5.6.3) - eslint: 9.16.0(jiti@1.21.6) - optionalDependencies: - typescript: 5.6.3 + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) + '@typescript-eslint/scope-manager': 8.18.2 + '@typescript-eslint/types': 8.18.2 + '@typescript-eslint/typescript-estree': 8.18.2(typescript@5.7.2) + eslint: 9.17.0(jiti@1.21.7) + typescript: 5.7.2 transitivePeerDependencies: - supports-color - '@typescript-eslint/visitor-keys@8.16.0': + '@typescript-eslint/visitor-keys@8.18.2': dependencies: - '@typescript-eslint/types': 8.16.0 + '@typescript-eslint/types': 8.18.2 eslint-visitor-keys: 4.2.0 - '@vitejs/plugin-vue@5.2.1(vite@6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1))(vue@3.5.13(typescript@5.6.3))': + '@vitejs/plugin-vue@5.2.1(vite@6.0.6(@types/node@22.10.2)(jiti@1.21.7)(stylus@0.57.0)(yaml@2.6.1))(vue@3.5.13(typescript@5.7.2))': dependencies: - vite: 6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1) - vue: 3.5.13(typescript@5.6.3) + vite: 6.0.6(@types/node@22.10.2)(jiti@1.21.7)(stylus@0.57.0)(yaml@2.6.1) + vue: 3.5.13(typescript@5.7.2) - '@vitest/eslint-plugin@1.1.13(@typescript-eslint/utils@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3)(vitest@2.1.6(@types/node@22.10.1)(jiti@1.21.6)(jsdom@25.0.1)(stylus@0.57.0)(yaml@2.6.1))': + '@vitest/eslint-plugin@1.1.20(@typescript-eslint/utils@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2)(vitest@2.1.8(@types/node@22.10.2)(jsdom@25.0.1)(stylus@0.57.0))': dependencies: - '@typescript-eslint/utils': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - eslint: 9.16.0(jiti@1.21.6) + '@typescript-eslint/utils': 8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + eslint: 9.17.0(jiti@1.21.7) optionalDependencies: - typescript: 5.6.3 - vitest: 2.1.6(@types/node@22.10.1)(jiti@1.21.6)(jsdom@25.0.1)(stylus@0.57.0)(yaml@2.6.1) + typescript: 5.7.2 + vitest: 2.1.8(@types/node@22.10.2)(jsdom@25.0.1)(stylus@0.57.0) - '@vitest/expect@2.1.6': + '@vitest/expect@2.1.8': dependencies: - '@vitest/spy': 2.1.6 - '@vitest/utils': 2.1.6 + '@vitest/spy': 2.1.8 + '@vitest/utils': 2.1.8 chai: 5.1.2 tinyrainbow: 1.2.0 - '@vitest/mocker@2.1.6(vite@6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1))': + '@vitest/mocker@2.1.8(vite@5.4.11(@types/node@22.10.2)(stylus@0.57.0))': dependencies: - '@vitest/spy': 2.1.6 + '@vitest/spy': 2.1.8 estree-walker: 3.0.3 - magic-string: 0.30.14 + magic-string: 0.30.17 optionalDependencies: - vite: 6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1) + vite: 5.4.11(@types/node@22.10.2)(stylus@0.57.0) - '@vitest/pretty-format@2.1.6': + '@vitest/pretty-format@2.1.8': dependencies: tinyrainbow: 1.2.0 - '@vitest/runner@2.1.6': + '@vitest/runner@2.1.8': dependencies: - '@vitest/utils': 2.1.6 + '@vitest/utils': 2.1.8 pathe: 1.1.2 - '@vitest/snapshot@2.1.6': + '@vitest/snapshot@2.1.8': dependencies: - '@vitest/pretty-format': 2.1.6 - magic-string: 0.30.14 + '@vitest/pretty-format': 2.1.8 + magic-string: 0.30.17 pathe: 1.1.2 - '@vitest/spy@2.1.6': + '@vitest/spy@2.1.8': dependencies: tinyspy: 3.0.2 - '@vitest/utils@2.1.6': + '@vitest/utils@2.1.8': dependencies: - '@vitest/pretty-format': 2.1.6 + '@vitest/pretty-format': 2.1.8 loupe: 3.1.2 tinyrainbow: 1.2.0 - '@volar/language-core@2.4.10': + '@volar/language-core@2.4.11': dependencies: - '@volar/source-map': 2.4.10 + '@volar/source-map': 2.4.11 - '@volar/source-map@2.4.10': {} + '@volar/source-map@2.4.11': {} - '@volar/typescript@2.4.10': + '@volar/typescript@2.4.11': dependencies: - '@volar/language-core': 2.4.10 + '@volar/language-core': 2.4.11 path-browserify: 1.0.1 vscode-uri: 3.0.8 '@vue/compiler-core@3.5.13': dependencies: - '@babel/parser': 7.26.2 + '@babel/parser': 7.26.3 '@vue/shared': 3.5.13 entities: 4.5.0 estree-walker: 2.0.2 @@ -3582,13 +3817,13 @@ snapshots: '@vue/compiler-sfc@3.5.13': dependencies: - '@babel/parser': 7.26.2 + '@babel/parser': 7.26.3 '@vue/compiler-core': 3.5.13 '@vue/compiler-dom': 3.5.13 '@vue/compiler-ssr': 3.5.13 '@vue/shared': 3.5.13 estree-walker: 2.0.2 - magic-string: 0.30.14 + magic-string: 0.30.17 postcss: 8.4.49 source-map-js: 1.2.1 @@ -3604,18 +3839,18 @@ snapshots: '@vue/devtools-api@6.6.4': {} - '@vue/language-core@2.1.10(typescript@5.6.3)': + '@vue/language-core@2.2.0(typescript@5.7.2)': dependencies: - '@volar/language-core': 2.4.10 + '@volar/language-core': 2.4.11 '@vue/compiler-dom': 3.5.13 '@vue/compiler-vue2': 2.7.16 '@vue/shared': 3.5.13 - alien-signals: 0.2.2 + alien-signals: 0.4.9 minimatch: 9.0.5 muggle-string: 0.4.1 path-browserify: 1.0.1 optionalDependencies: - typescript: 5.6.3 + typescript: 5.7.2 '@vue/reactivity@3.5.13': dependencies: @@ -3633,40 +3868,40 @@ snapshots: '@vue/shared': 3.5.13 csstype: 3.1.3 - '@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.6.3))': + '@vue/server-renderer@3.5.13(vue@3.5.13(typescript@5.7.2))': dependencies: '@vue/compiler-ssr': 3.5.13 '@vue/shared': 3.5.13 - vue: 3.5.13(typescript@5.6.3) + vue: 3.5.13(typescript@5.7.2) '@vue/shared@3.5.13': {} '@vue/test-utils@2.4.6': dependencies: js-beautify: 1.15.1 - vue-component-type-helpers: 2.1.10 + vue-component-type-helpers: 2.2.0 - '@vueuse/core@12.0.0(typescript@5.6.3)': + '@vueuse/core@12.2.0(typescript@5.7.2)': dependencies: '@types/web-bluetooth': 0.0.20 - '@vueuse/metadata': 12.0.0 - '@vueuse/shared': 12.0.0(typescript@5.6.3) - vue: 3.5.13(typescript@5.6.3) + '@vueuse/metadata': 12.2.0 + '@vueuse/shared': 12.2.0(typescript@5.7.2) + vue: 3.5.13(typescript@5.7.2) transitivePeerDependencies: - typescript - '@vueuse/metadata@12.0.0': {} + '@vueuse/metadata@12.2.0': {} - '@vueuse/shared@12.0.0(typescript@5.6.3)': + '@vueuse/shared@12.2.0(typescript@5.7.2)': dependencies: - vue: 3.5.13(typescript@5.6.3) + vue: 3.5.13(typescript@5.7.2) transitivePeerDependencies: - typescript '@windicss/config@1.9.4': dependencies: - debug: 4.3.7 - jiti: 1.21.6 + debug: 4.4.0 + jiti: 1.21.7 windicss: 3.5.6 transitivePeerDependencies: - supports-color @@ -3675,9 +3910,9 @@ snapshots: dependencies: '@antfu/utils': 0.7.10 '@windicss/config': 1.9.4 - debug: 4.3.7 + debug: 4.4.0 fast-glob: 3.3.2 - magic-string: 0.30.14 + magic-string: 0.30.17 micromatch: 4.0.8 windicss: 3.5.6 transitivePeerDependencies: @@ -3691,11 +3926,7 @@ snapshots: acorn@8.14.0: {} - agent-base@7.1.1: - dependencies: - debug: 4.3.7 - transitivePeerDependencies: - - supports-color + agent-base@7.1.3: {} ajv@6.12.6: dependencies: @@ -3704,7 +3935,7 @@ snapshots: json-schema-traverse: 0.4.1 uri-js: 4.4.1 - alien-signals@0.2.2: {} + alien-signals@0.4.9: {} ansi-regex@5.0.1: {} @@ -3749,12 +3980,12 @@ snapshots: dependencies: fill-range: 7.1.1 - browserslist@4.24.2: + browserslist@4.24.3: dependencies: - caniuse-lite: 1.0.30001684 - electron-to-chromium: 1.5.67 - node-releases: 2.0.18 - update-browserslist-db: 1.1.1(browserslist@4.24.2) + caniuse-lite: 1.0.30001690 + electron-to-chromium: 1.5.76 + node-releases: 2.0.19 + update-browserslist-db: 1.1.1(browserslist@4.24.3) builtin-modules@3.3.0: {} @@ -3762,7 +3993,7 @@ snapshots: callsites@3.1.0: {} - caniuse-lite@1.0.30001684: {} + caniuse-lite@1.0.30001690: {} ccount@2.0.1: {} @@ -3826,7 +4057,7 @@ snapshots: core-js-compat@3.39.0: dependencies: - browserslist: 4.24.2 + browserslist: 4.24.3 cross-spawn@7.0.6: dependencies: @@ -3875,7 +4106,7 @@ snapshots: data-urls@5.0.0: dependencies: whatwg-mimetype: 4.0.0 - whatwg-url: 14.0.0 + whatwg-url: 14.1.0 de-indent@1.0.2: {} @@ -3883,7 +4114,7 @@ snapshots: dependencies: ms: 2.1.3 - debug@4.3.7: + debug@4.4.0: dependencies: ms: 2.1.3 @@ -3923,7 +4154,7 @@ snapshots: dependencies: domelementtype: 2.3.0 - dompurify@3.2.2: + dompurify@3.2.3: optionalDependencies: '@types/trusted-types': 2.0.7 @@ -3942,7 +4173,7 @@ snapshots: minimatch: 9.0.1 semver: 7.6.3 - electron-to-chromium@1.5.67: {} + electron-to-chromium@1.5.76: {} emoji-regex@8.0.0: {} @@ -3950,7 +4181,7 @@ snapshots: emojilib@2.4.0: {} - enhanced-resolve@5.17.1: + enhanced-resolve@5.18.0: dependencies: graceful-fs: 4.2.11 tapable: 2.2.1 @@ -3963,32 +4194,59 @@ snapshots: es-module-lexer@1.5.4: {} - esbuild@0.24.0: + esbuild@0.21.5: optionalDependencies: - '@esbuild/aix-ppc64': 0.24.0 - '@esbuild/android-arm': 0.24.0 - '@esbuild/android-arm64': 0.24.0 - '@esbuild/android-x64': 0.24.0 - '@esbuild/darwin-arm64': 0.24.0 - '@esbuild/darwin-x64': 0.24.0 - '@esbuild/freebsd-arm64': 0.24.0 - '@esbuild/freebsd-x64': 0.24.0 - '@esbuild/linux-arm': 0.24.0 - '@esbuild/linux-arm64': 0.24.0 - '@esbuild/linux-ia32': 0.24.0 - '@esbuild/linux-loong64': 0.24.0 - '@esbuild/linux-mips64el': 0.24.0 - '@esbuild/linux-ppc64': 0.24.0 - '@esbuild/linux-riscv64': 0.24.0 - '@esbuild/linux-s390x': 0.24.0 - '@esbuild/linux-x64': 0.24.0 - '@esbuild/netbsd-x64': 0.24.0 - '@esbuild/openbsd-arm64': 0.24.0 - '@esbuild/openbsd-x64': 0.24.0 - '@esbuild/sunos-x64': 0.24.0 - '@esbuild/win32-arm64': 0.24.0 - '@esbuild/win32-ia32': 0.24.0 - '@esbuild/win32-x64': 0.24.0 + '@esbuild/aix-ppc64': 0.21.5 + '@esbuild/android-arm': 0.21.5 + '@esbuild/android-arm64': 0.21.5 + '@esbuild/android-x64': 0.21.5 + '@esbuild/darwin-arm64': 0.21.5 + '@esbuild/darwin-x64': 0.21.5 + '@esbuild/freebsd-arm64': 0.21.5 + '@esbuild/freebsd-x64': 0.21.5 + '@esbuild/linux-arm': 0.21.5 + '@esbuild/linux-arm64': 0.21.5 + '@esbuild/linux-ia32': 0.21.5 + '@esbuild/linux-loong64': 0.21.5 + '@esbuild/linux-mips64el': 0.21.5 + '@esbuild/linux-ppc64': 0.21.5 + '@esbuild/linux-riscv64': 0.21.5 + '@esbuild/linux-s390x': 0.21.5 + '@esbuild/linux-x64': 0.21.5 + '@esbuild/netbsd-x64': 0.21.5 + '@esbuild/openbsd-x64': 0.21.5 + '@esbuild/sunos-x64': 0.21.5 + '@esbuild/win32-arm64': 0.21.5 + '@esbuild/win32-ia32': 0.21.5 + '@esbuild/win32-x64': 0.21.5 + + esbuild@0.24.2: + optionalDependencies: + '@esbuild/aix-ppc64': 0.24.2 + '@esbuild/android-arm': 0.24.2 + '@esbuild/android-arm64': 0.24.2 + '@esbuild/android-x64': 0.24.2 + '@esbuild/darwin-arm64': 0.24.2 + '@esbuild/darwin-x64': 0.24.2 + '@esbuild/freebsd-arm64': 0.24.2 + '@esbuild/freebsd-x64': 0.24.2 + '@esbuild/linux-arm': 0.24.2 + '@esbuild/linux-arm64': 0.24.2 + '@esbuild/linux-ia32': 0.24.2 + '@esbuild/linux-loong64': 0.24.2 + '@esbuild/linux-mips64el': 0.24.2 + '@esbuild/linux-ppc64': 0.24.2 + '@esbuild/linux-riscv64': 0.24.2 + '@esbuild/linux-s390x': 0.24.2 + '@esbuild/linux-x64': 0.24.2 + '@esbuild/netbsd-arm64': 0.24.2 + '@esbuild/netbsd-x64': 0.24.2 + '@esbuild/openbsd-arm64': 0.24.2 + '@esbuild/openbsd-x64': 0.24.2 + '@esbuild/sunos-x64': 0.24.2 + '@esbuild/win32-arm64': 0.24.2 + '@esbuild/win32-ia32': 0.24.2 + '@esbuild/win32-x64': 0.24.2 escalade@3.2.0: {} @@ -4006,20 +4264,20 @@ snapshots: optionalDependencies: source-map: 0.6.1 - eslint-compat-utils@0.5.1(eslint@9.16.0(jiti@1.21.6)): + eslint-compat-utils@0.5.1(eslint@9.17.0(jiti@1.21.7)): dependencies: - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) semver: 7.6.3 - eslint-compat-utils@0.6.4(eslint@9.16.0(jiti@1.21.6)): + eslint-compat-utils@0.6.4(eslint@9.17.0(jiti@1.21.7)): dependencies: - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) semver: 7.6.3 - eslint-config-flat-gitignore@0.3.0(eslint@9.16.0(jiti@1.21.6)): + eslint-config-flat-gitignore@0.3.0(eslint@9.17.0(jiti@1.21.7)): dependencies: - '@eslint/compat': 1.2.3(eslint@9.16.0(jiti@1.21.6)) - eslint: 9.16.0(jiti@1.21.6) + '@eslint/compat': 1.2.4(eslint@9.17.0(jiti@1.21.7)) + eslint: 9.17.0(jiti@1.21.7) find-up-simple: 1.0.0 eslint-flat-config-utils@0.4.0: @@ -4029,44 +4287,47 @@ snapshots: eslint-import-resolver-node@0.3.9: dependencies: debug: 3.2.7 - is-core-module: 2.15.1 - resolve: 1.22.8 + is-core-module: 2.16.1 + resolve: 1.22.10 transitivePeerDependencies: - supports-color - eslint-json-compat-utils@0.2.1(eslint@9.16.0(jiti@1.21.6))(jsonc-eslint-parser@2.4.0): + eslint-json-compat-utils@0.2.1(eslint@9.17.0(jiti@1.21.7))(jsonc-eslint-parser@2.4.0): dependencies: - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) esquery: 1.6.0 jsonc-eslint-parser: 2.4.0 - eslint-merge-processors@0.1.0(eslint@9.16.0(jiti@1.21.6)): + eslint-merge-processors@0.1.0(eslint@9.17.0(jiti@1.21.7)): dependencies: - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) - eslint-plugin-antfu@2.7.0(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-antfu@2.7.0(eslint@9.17.0(jiti@1.21.7)): dependencies: '@antfu/utils': 0.7.10 - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) - eslint-plugin-command@0.2.6(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-command@0.2.7(eslint@9.17.0(jiti@1.21.7)): dependencies: - '@es-joy/jsdoccomment': 0.48.0 - eslint: 9.16.0(jiti@1.21.6) + '@es-joy/jsdoccomment': 0.49.0 + eslint: 9.17.0(jiti@1.21.7) - eslint-plugin-es-x@7.8.0(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-es-x@7.8.0(eslint@9.17.0(jiti@1.21.7)): dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) '@eslint-community/regexpp': 4.12.1 - eslint: 9.16.0(jiti@1.21.6) - eslint-compat-utils: 0.5.1(eslint@9.16.0(jiti@1.21.6)) + eslint: 9.17.0(jiti@1.21.7) + eslint-compat-utils: 0.5.1(eslint@9.17.0(jiti@1.21.7)) - eslint-plugin-import-x@4.4.3(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3): + eslint-plugin-import-x@4.6.1(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2): dependencies: - '@typescript-eslint/utils': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - debug: 4.3.7 + '@types/doctrine': 0.0.9 + '@typescript-eslint/scope-manager': 8.18.2 + '@typescript-eslint/utils': 8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + debug: 4.4.0 doctrine: 3.0.0 - eslint: 9.16.0(jiti@1.21.6) + enhanced-resolve: 5.18.0 + eslint: 9.17.0(jiti@1.21.7) eslint-import-resolver-node: 0.3.9 get-tsconfig: 4.8.1 is-glob: 4.0.3 @@ -4078,14 +4339,14 @@ snapshots: - supports-color - typescript - eslint-plugin-jsdoc@50.6.0(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-jsdoc@50.6.1(eslint@9.17.0(jiti@1.21.7)): dependencies: '@es-joy/jsdoccomment': 0.49.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 - debug: 4.3.7 + debug: 4.4.0 escape-string-regexp: 4.0.0 - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) espree: 10.3.0 esquery: 1.6.0 parse-imports: 2.2.1 @@ -4095,12 +4356,12 @@ snapshots: transitivePeerDependencies: - supports-color - eslint-plugin-jsonc@2.18.2(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-jsonc@2.18.2(eslint@9.17.0(jiti@1.21.7)): dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) - eslint: 9.16.0(jiti@1.21.6) - eslint-compat-utils: 0.6.4(eslint@9.16.0(jiti@1.21.6)) - eslint-json-compat-utils: 0.2.1(eslint@9.16.0(jiti@1.21.6))(jsonc-eslint-parser@2.4.0) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) + eslint: 9.17.0(jiti@1.21.7) + eslint-compat-utils: 0.6.4(eslint@9.17.0(jiti@1.21.7)) + eslint-json-compat-utils: 0.2.1(eslint@9.17.0(jiti@1.21.7))(jsonc-eslint-parser@2.4.0) espree: 9.6.1 graphemer: 1.4.0 jsonc-eslint-parser: 2.4.0 @@ -4109,69 +4370,69 @@ snapshots: transitivePeerDependencies: - '@eslint/json' - eslint-plugin-n@17.14.0(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-n@17.15.1(eslint@9.17.0(jiti@1.21.7)): dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) - enhanced-resolve: 5.17.1 - eslint: 9.16.0(jiti@1.21.6) - eslint-plugin-es-x: 7.8.0(eslint@9.16.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) + enhanced-resolve: 5.18.0 + eslint: 9.17.0(jiti@1.21.7) + eslint-plugin-es-x: 7.8.0(eslint@9.17.0(jiti@1.21.7)) get-tsconfig: 4.8.1 - globals: 15.13.0 + globals: 15.14.0 ignore: 5.3.2 minimatch: 9.0.5 semver: 7.6.3 eslint-plugin-no-only-tests@3.3.0: {} - eslint-plugin-perfectionist@4.1.2(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3): + eslint-plugin-perfectionist@4.4.0(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2): dependencies: - '@typescript-eslint/types': 8.16.0 - '@typescript-eslint/utils': 8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) - eslint: 9.16.0(jiti@1.21.6) + '@typescript-eslint/types': 8.18.2 + '@typescript-eslint/utils': 8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + eslint: 9.17.0(jiti@1.21.7) natural-orderby: 5.0.0 transitivePeerDependencies: - supports-color - typescript - eslint-plugin-promise@7.2.1(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-promise@7.2.1(eslint@9.17.0(jiti@1.21.7)): dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) - eslint: 9.16.0(jiti@1.21.6) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) + eslint: 9.17.0(jiti@1.21.7) - eslint-plugin-regexp@2.7.0(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-regexp@2.7.0(eslint@9.17.0(jiti@1.21.7)): dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) '@eslint-community/regexpp': 4.12.1 comment-parser: 1.4.1 - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) jsdoc-type-pratt-parser: 4.1.0 refa: 0.12.1 regexp-ast-analysis: 0.7.1 scslre: 0.3.0 - eslint-plugin-toml@0.11.1(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-toml@0.12.0(eslint@9.17.0(jiti@1.21.7)): dependencies: - debug: 4.3.7 - eslint: 9.16.0(jiti@1.21.6) - eslint-compat-utils: 0.5.1(eslint@9.16.0(jiti@1.21.6)) + debug: 4.4.0 + eslint: 9.17.0(jiti@1.21.7) + eslint-compat-utils: 0.6.4(eslint@9.17.0(jiti@1.21.7)) lodash: 4.17.21 toml-eslint-parser: 0.10.0 transitivePeerDependencies: - supports-color - eslint-plugin-unicorn@56.0.1(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-unicorn@56.0.1(eslint@9.17.0(jiti@1.21.7)): dependencies: '@babel/helper-validator-identifier': 7.25.9 - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) ci-info: 4.1.0 clean-regexp: 1.0.0 core-js-compat: 3.39.0 - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) esquery: 1.6.0 - globals: 15.13.0 + globals: 15.14.0 indent-string: 4.0.0 is-builtin-module: 3.2.1 - jsesc: 3.0.2 + jsesc: 3.1.0 pluralize: 8.0.0 read-pkg-up: 7.0.1 regexp-tree: 0.1.27 @@ -4179,56 +4440,56 @@ snapshots: semver: 7.6.3 strip-indent: 3.0.0 - eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.16.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-unused-imports@4.1.4(@typescript-eslint/eslint-plugin@8.18.2(@typescript-eslint/parser@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(eslint@9.17.0(jiti@1.21.7)): dependencies: - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) optionalDependencies: - '@typescript-eslint/eslint-plugin': 8.16.0(@typescript-eslint/parser@8.16.0(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.16.0(jiti@1.21.6))(typescript@5.6.3) + '@typescript-eslint/eslint-plugin': 8.18.2(@typescript-eslint/parser@8.18.2(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2))(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) - eslint-plugin-vue-scoped-css@2.9.0(eslint@9.16.0(jiti@1.21.6))(vue-eslint-parser@9.4.3(eslint@9.16.0(jiti@1.21.6))): + eslint-plugin-vue-scoped-css@2.9.0(eslint@9.17.0(jiti@1.21.7))(vue-eslint-parser@9.4.3(eslint@9.17.0(jiti@1.21.7))): dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) - eslint: 9.16.0(jiti@1.21.6) - eslint-compat-utils: 0.6.4(eslint@9.16.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) + eslint: 9.17.0(jiti@1.21.7) + eslint-compat-utils: 0.6.4(eslint@9.17.0(jiti@1.21.7)) lodash: 4.17.21 postcss: 8.4.49 postcss-safe-parser: 6.0.0(postcss@8.4.49) postcss-scss: 4.0.9(postcss@8.4.49) postcss-selector-parser: 6.1.2 postcss-styl: 0.12.3 - vue-eslint-parser: 9.4.3(eslint@9.16.0(jiti@1.21.6)) + vue-eslint-parser: 9.4.3(eslint@9.17.0(jiti@1.21.7)) transitivePeerDependencies: - supports-color - eslint-plugin-vue@9.32.0(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-vue@9.32.0(eslint@9.17.0(jiti@1.21.7)): dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) - eslint: 9.16.0(jiti@1.21.6) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) + eslint: 9.17.0(jiti@1.21.7) globals: 13.24.0 natural-compare: 1.4.0 nth-check: 2.1.1 postcss-selector-parser: 6.1.2 semver: 7.6.3 - vue-eslint-parser: 9.4.3(eslint@9.16.0(jiti@1.21.6)) + vue-eslint-parser: 9.4.3(eslint@9.17.0(jiti@1.21.7)) xml-name-validator: 4.0.0 transitivePeerDependencies: - supports-color - eslint-plugin-yml@1.16.0(eslint@9.16.0(jiti@1.21.6)): + eslint-plugin-yml@1.16.0(eslint@9.17.0(jiti@1.21.7)): dependencies: - debug: 4.3.7 - eslint: 9.16.0(jiti@1.21.6) - eslint-compat-utils: 0.6.4(eslint@9.16.0(jiti@1.21.6)) + debug: 4.4.0 + eslint: 9.17.0(jiti@1.21.7) + eslint-compat-utils: 0.6.4(eslint@9.17.0(jiti@1.21.7)) lodash: 4.17.21 natural-compare: 1.4.0 yaml-eslint-parser: 1.2.3 transitivePeerDependencies: - supports-color - eslint-processor-vue-blocks@0.1.2(@vue/compiler-sfc@3.5.13)(eslint@9.16.0(jiti@1.21.6)): + eslint-processor-vue-blocks@0.1.2(@vue/compiler-sfc@3.5.13)(eslint@9.17.0(jiti@1.21.7)): dependencies: '@vue/compiler-sfc': 3.5.13 - eslint: 9.16.0(jiti@1.21.6) + eslint: 9.17.0(jiti@1.21.7) eslint-scope@7.2.2: dependencies: @@ -4244,15 +4505,15 @@ snapshots: eslint-visitor-keys@4.2.0: {} - eslint@9.16.0(jiti@1.21.6): + eslint@9.17.0(jiti@1.21.7): dependencies: - '@eslint-community/eslint-utils': 4.4.1(eslint@9.16.0(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.1(eslint@9.17.0(jiti@1.21.7)) '@eslint-community/regexpp': 4.12.1 - '@eslint/config-array': 0.19.0 - '@eslint/core': 0.9.0 + '@eslint/config-array': 0.19.1 + '@eslint/core': 0.9.1 '@eslint/eslintrc': 3.2.0 - '@eslint/js': 9.16.0 - '@eslint/plugin-kit': 0.2.3 + '@eslint/js': 9.17.0 + '@eslint/plugin-kit': 0.2.4 '@humanfs/node': 0.16.6 '@humanwhocodes/module-importer': 1.0.1 '@humanwhocodes/retry': 0.4.1 @@ -4261,7 +4522,7 @@ snapshots: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.6 - debug: 4.3.7 + debug: 4.4.0 escape-string-regexp: 4.0.0 eslint-scope: 8.2.0 eslint-visitor-keys: 4.2.0 @@ -4281,7 +4542,7 @@ snapshots: natural-compare: 1.4.0 optionator: 0.9.4 optionalDependencies: - jiti: 1.21.6 + jiti: 1.21.7 transitivePeerDependencies: - supports-color @@ -4335,7 +4596,7 @@ snapshots: fast-levenshtein@2.0.6: {} - fastq@1.17.1: + fastq@1.18.0: dependencies: reusify: 1.0.4 @@ -4428,7 +4689,7 @@ snapshots: globals@14.0.0: {} - globals@15.13.0: {} + globals@15.14.0: {} graceful-fs@4.2.11: {} @@ -4450,15 +4711,15 @@ snapshots: http-proxy-agent@7.0.2: dependencies: - agent-base: 7.1.1 - debug: 4.3.7 + agent-base: 7.1.3 + debug: 4.4.0 transitivePeerDependencies: - supports-color - https-proxy-agent@7.0.5: + https-proxy-agent@7.0.6: dependencies: - agent-base: 7.1.1 - debug: 4.3.7 + agent-base: 7.1.3 + debug: 4.4.0 transitivePeerDependencies: - supports-color @@ -4494,7 +4755,7 @@ snapshots: dependencies: builtin-modules: 3.3.0 - is-core-module@2.15.1: + is-core-module@2.16.1: dependencies: hasown: 2.0.2 @@ -4522,7 +4783,7 @@ snapshots: optionalDependencies: '@pkgjs/parseargs': 0.11.0 - jiti@1.21.6: {} + jiti@1.21.7: {} js-base64@3.7.7: {} @@ -4552,7 +4813,7 @@ snapshots: form-data: 4.0.1 html-encoding-sniffer: 4.0.0 http-proxy-agent: 7.0.2 - https-proxy-agent: 7.0.5 + https-proxy-agent: 7.0.6 is-potential-custom-element-name: 1.0.1 nwsapi: 2.2.16 parse5: 7.2.1 @@ -4564,7 +4825,7 @@ snapshots: webidl-conversions: 7.0.0 whatwg-encoding: 3.1.1 whatwg-mimetype: 4.0.0 - whatwg-url: 14.0.0 + whatwg-url: 14.1.0 ws: 8.18.0 xml-name-validator: 5.0.0 transitivePeerDependencies: @@ -4574,7 +4835,7 @@ snapshots: jsesc@0.5.0: {} - jsesc@3.0.2: {} + jsesc@3.1.0: {} json-buffer@3.0.1: {} @@ -4635,13 +4896,13 @@ snapshots: dependencies: yallist: 3.1.1 - magic-string@0.30.14: + magic-string@0.30.17: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 markdown-table@3.0.4: {} - marked@15.0.3: {} + marked@15.0.4: {} mdast-util-find-and-replace@3.0.1: dependencies: @@ -4923,7 +5184,7 @@ snapshots: micromark@4.0.1: dependencies: '@types/debug': 4.1.12 - debug: 4.3.7 + debug: 4.4.0 decode-named-character-reference: 1.0.2 devlop: 1.1.0 micromark-core-commonmark: 2.0.2 @@ -4986,14 +5247,14 @@ snapshots: natural-orderby@5.0.0: {} - node-emoji@2.1.3: + node-emoji@2.2.0: dependencies: '@sindresorhus/is': 4.6.0 char-regex: 1.0.2 emojilib: 2.4.0 skin-tone: 2.0.0 - node-releases@2.0.18: {} + node-releases@2.0.19: {} nopt@7.2.1: dependencies: @@ -5002,7 +5263,7 @@ snapshots: normalize-package-data@2.5.0: dependencies: hosted-git-info: 2.8.9 - resolve: 1.22.8 + resolve: 1.22.10 semver: 7.6.3 validate-npm-package-license: 3.0.4 @@ -5045,7 +5306,7 @@ snapshots: package-json-from-dist@1.0.1: {} - package-manager-detector@0.2.6: {} + package-manager-detector@0.2.8: {} parent-module@1.0.1: dependencies: @@ -5094,13 +5355,15 @@ snapshots: picomatch@4.0.2: {} - pinia@2.2.8(typescript@5.6.3)(vue@3.5.13(typescript@5.6.3)): + pinia@2.3.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)): dependencies: '@vue/devtools-api': 6.6.4 - vue: 3.5.13(typescript@5.6.3) - vue-demi: 0.14.10(vue@3.5.13(typescript@5.6.3)) + vue: 3.5.13(typescript@5.7.2) + vue-demi: 0.14.10(vue@3.5.13(typescript@5.7.2)) optionalDependencies: - typescript: 5.6.3 + typescript: 5.7.2 + transitivePeerDependencies: + - '@vue/composition-api' pkg-types@1.2.1: dependencies: @@ -5125,7 +5388,7 @@ snapshots: postcss-styl@0.12.3: dependencies: - debug: 4.3.7 + debug: 4.4.0 fast-diff: 1.3.0 lodash.sortedlastindex: 4.1.0 postcss: 8.4.49 @@ -5141,7 +5404,7 @@ snapshots: prelude-ls@1.2.1: {} - prettier@3.4.1: {} + prettier@3.4.2: {} prismjs@1.29.0: {} @@ -5187,36 +5450,37 @@ snapshots: resolve-pkg-maps@1.0.0: {} - resolve@1.22.8: + resolve@1.22.10: dependencies: - is-core-module: 2.15.1 + is-core-module: 2.16.1 path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 reusify@1.0.4: {} - rollup@4.28.0: + rollup@4.29.1: dependencies: '@types/estree': 1.0.6 optionalDependencies: - '@rollup/rollup-android-arm-eabi': 4.28.0 - '@rollup/rollup-android-arm64': 4.28.0 - '@rollup/rollup-darwin-arm64': 4.28.0 - '@rollup/rollup-darwin-x64': 4.28.0 - '@rollup/rollup-freebsd-arm64': 4.28.0 - '@rollup/rollup-freebsd-x64': 4.28.0 - '@rollup/rollup-linux-arm-gnueabihf': 4.28.0 - '@rollup/rollup-linux-arm-musleabihf': 4.28.0 - '@rollup/rollup-linux-arm64-gnu': 4.28.0 - '@rollup/rollup-linux-arm64-musl': 4.28.0 - '@rollup/rollup-linux-powerpc64le-gnu': 4.28.0 - '@rollup/rollup-linux-riscv64-gnu': 4.28.0 - '@rollup/rollup-linux-s390x-gnu': 4.28.0 - '@rollup/rollup-linux-x64-gnu': 4.28.0 - '@rollup/rollup-linux-x64-musl': 4.28.0 - '@rollup/rollup-win32-arm64-msvc': 4.28.0 - '@rollup/rollup-win32-ia32-msvc': 4.28.0 - '@rollup/rollup-win32-x64-msvc': 4.28.0 + '@rollup/rollup-android-arm-eabi': 4.29.1 + '@rollup/rollup-android-arm64': 4.29.1 + '@rollup/rollup-darwin-arm64': 4.29.1 + '@rollup/rollup-darwin-x64': 4.29.1 + '@rollup/rollup-freebsd-arm64': 4.29.1 + '@rollup/rollup-freebsd-x64': 4.29.1 + '@rollup/rollup-linux-arm-gnueabihf': 4.29.1 + '@rollup/rollup-linux-arm-musleabihf': 4.29.1 + '@rollup/rollup-linux-arm64-gnu': 4.29.1 + '@rollup/rollup-linux-arm64-musl': 4.29.1 + '@rollup/rollup-linux-loongarch64-gnu': 4.29.1 + '@rollup/rollup-linux-powerpc64le-gnu': 4.29.1 + '@rollup/rollup-linux-riscv64-gnu': 4.29.1 + '@rollup/rollup-linux-s390x-gnu': 4.29.1 + '@rollup/rollup-linux-x64-gnu': 4.29.1 + '@rollup/rollup-linux-x64-musl': 4.29.1 + '@rollup/rollup-win32-arm64-msvc': 4.29.1 + '@rollup/rollup-win32-ia32-msvc': 4.29.1 + '@rollup/rollup-win32-x64-msvc': 4.29.1 fsevents: 2.3.3 rrweb-cssom@0.7.1: {} @@ -5251,7 +5515,7 @@ snapshots: signal-exit@4.1.0: {} - simple-icons@13.19.0: {} + simple-icons@14.0.0: {} sisteransi@1.0.5: {} @@ -5326,7 +5590,7 @@ snapshots: stylus@0.57.0: dependencies: css: 3.0.0 - debug: 4.3.7 + debug: 4.4.0 glob: 7.2.3 safer-buffer: 2.1.2 sax: 1.2.4 @@ -5375,11 +5639,11 @@ snapshots: tinyspy@3.0.2: {} - tldts-core@6.1.65: {} + tldts-core@6.1.69: {} - tldts@6.1.65: + tldts@6.1.69: dependencies: - tldts-core: 6.1.65 + tldts-core: 6.1.69 to-regex-range@5.0.1: dependencies: @@ -5391,15 +5655,15 @@ snapshots: tough-cookie@5.0.0: dependencies: - tldts: 6.1.65 + tldts: 6.1.69 tr46@5.0.0: dependencies: punycode: 2.3.1 - ts-api-utils@1.4.3(typescript@5.6.3): + ts-api-utils@1.4.3(typescript@5.7.2): dependencies: - typescript: 5.6.3 + typescript: 5.7.2 tslib@2.8.1: {} @@ -5413,7 +5677,7 @@ snapshots: type-fest@0.8.1: {} - typescript@5.6.3: {} + typescript@5.7.2: {} ufo@1.5.4: {} @@ -5445,9 +5709,9 @@ snapshots: acorn: 8.14.0 webpack-virtual-modules: 0.6.2 - update-browserslist-db@1.1.1(browserslist@4.24.2): + update-browserslist-db@1.1.1(browserslist@4.24.3): dependencies: - browserslist: 4.24.2 + browserslist: 4.24.3 escalade: 3.2.0 picocolors: 1.1.1 @@ -5462,16 +5726,15 @@ snapshots: spdx-correct: 3.2.0 spdx-expression-parse: 3.0.1 - vite-node@2.1.6(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1): + vite-node@2.1.8(@types/node@22.10.2)(stylus@0.57.0): dependencies: cac: 6.7.14 - debug: 4.3.7 + debug: 4.4.0 es-module-lexer: 1.5.4 pathe: 1.1.2 - vite: 6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1) + vite: 5.4.11(@types/node@22.10.2)(stylus@0.57.0) transitivePeerDependencies: - '@types/node' - - jiti - less - lightningcss - sass @@ -5480,8 +5743,6 @@ snapshots: - sugarss - supports-color - terser - - tsx - - yaml vite-plugin-prismjs@0.0.11(prismjs@1.29.0): dependencies: @@ -5491,60 +5752,69 @@ snapshots: - prismjs - supports-color - vite-plugin-windicss@1.9.4(vite@6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1)): + vite-plugin-windicss@1.9.4(vite@6.0.6(@types/node@22.10.2)(jiti@1.21.7)(stylus@0.57.0)(yaml@2.6.1)): dependencies: '@windicss/plugin-utils': 1.9.4 - debug: 4.3.7 + debug: 4.4.0 kolorist: 1.8.0 - vite: 6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1) + vite: 6.0.6(@types/node@22.10.2)(jiti@1.21.7)(stylus@0.57.0)(yaml@2.6.1) windicss: 3.5.6 transitivePeerDependencies: - supports-color - vite-svg-loader@5.1.0(vue@3.5.13(typescript@5.6.3)): + vite-svg-loader@5.1.0(vue@3.5.13(typescript@5.7.2)): dependencies: svgo: 3.3.2 - vue: 3.5.13(typescript@5.6.3) + vue: 3.5.13(typescript@5.7.2) - vite@6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1): + vite@5.4.11(@types/node@22.10.2)(stylus@0.57.0): dependencies: - esbuild: 0.24.0 + esbuild: 0.21.5 postcss: 8.4.49 - rollup: 4.28.0 + rollup: 4.29.1 optionalDependencies: - '@types/node': 22.10.1 + '@types/node': 22.10.2 fsevents: 2.3.3 - jiti: 1.21.6 + stylus: 0.57.0 + + vite@6.0.6(@types/node@22.10.2)(jiti@1.21.7)(stylus@0.57.0)(yaml@2.6.1): + dependencies: + esbuild: 0.24.2 + postcss: 8.4.49 + rollup: 4.29.1 + optionalDependencies: + '@types/node': 22.10.2 + fsevents: 2.3.3 + jiti: 1.21.7 stylus: 0.57.0 yaml: 2.6.1 - vitest@2.1.6(@types/node@22.10.1)(jiti@1.21.6)(jsdom@25.0.1)(stylus@0.57.0)(yaml@2.6.1): + vitest@2.1.8(@types/node@22.10.2)(jsdom@25.0.1)(stylus@0.57.0): dependencies: - '@vitest/expect': 2.1.6 - '@vitest/mocker': 2.1.6(vite@6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1)) - '@vitest/pretty-format': 2.1.6 - '@vitest/runner': 2.1.6 - '@vitest/snapshot': 2.1.6 - '@vitest/spy': 2.1.6 - '@vitest/utils': 2.1.6 + '@vitest/expect': 2.1.8 + '@vitest/mocker': 2.1.8(vite@5.4.11(@types/node@22.10.2)(stylus@0.57.0)) + '@vitest/pretty-format': 2.1.8 + '@vitest/runner': 2.1.8 + '@vitest/snapshot': 2.1.8 + '@vitest/spy': 2.1.8 + '@vitest/utils': 2.1.8 chai: 5.1.2 - debug: 4.3.7 + debug: 4.4.0 expect-type: 1.1.0 - magic-string: 0.30.14 + magic-string: 0.30.17 pathe: 1.1.2 std-env: 3.8.0 tinybench: 2.9.0 tinyexec: 0.3.1 tinypool: 1.0.2 tinyrainbow: 1.2.0 - vite: 6.0.2(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1) - vite-node: 2.1.6(@types/node@22.10.1)(jiti@1.21.6)(stylus@0.57.0)(yaml@2.6.1) + vite: 5.4.11(@types/node@22.10.2)(stylus@0.57.0) + vite-node: 2.1.8(@types/node@22.10.2)(stylus@0.57.0) why-is-node-running: 2.3.0 optionalDependencies: - '@types/node': 22.10.1 + '@types/node': 22.10.2 jsdom: 25.0.1 transitivePeerDependencies: - - jiti - less - lightningcss - msw @@ -5554,21 +5824,19 @@ snapshots: - sugarss - supports-color - terser - - tsx - - yaml vscode-uri@3.0.8: {} - vue-component-type-helpers@2.1.10: {} + vue-component-type-helpers@2.2.0: {} - vue-demi@0.14.10(vue@3.5.13(typescript@5.6.3)): + vue-demi@0.14.10(vue@3.5.13(typescript@5.7.2)): dependencies: - vue: 3.5.13(typescript@5.6.3) + vue: 3.5.13(typescript@5.7.2) - vue-eslint-parser@9.4.3(eslint@9.16.0(jiti@1.21.6)): + vue-eslint-parser@9.4.3(eslint@9.17.0(jiti@1.21.7)): dependencies: - debug: 4.3.7 - eslint: 9.16.0(jiti@1.21.6) + debug: 4.4.0 + eslint: 9.17.0(jiti@1.21.7) eslint-scope: 7.2.2 eslint-visitor-keys: 3.4.3 espree: 9.6.1 @@ -5578,34 +5846,33 @@ snapshots: transitivePeerDependencies: - supports-color - vue-i18n@10.0.5(vue@3.5.13(typescript@5.6.3)): + vue-i18n@11.0.1(vue@3.5.13(typescript@5.7.2)): dependencies: - '@intlify/core-base': 10.0.5 - '@intlify/shared': 10.0.5 + '@intlify/core-base': 11.0.1 + '@intlify/shared': 11.0.1 '@vue/devtools-api': 6.6.4 - vue: 3.5.13(typescript@5.6.3) + vue: 3.5.13(typescript@5.7.2) - vue-router@4.5.0(vue@3.5.13(typescript@5.6.3)): + vue-router@4.5.0(vue@3.5.13(typescript@5.7.2)): dependencies: '@vue/devtools-api': 6.6.4 - vue: 3.5.13(typescript@5.6.3) + vue: 3.5.13(typescript@5.7.2) - vue-tsc@2.1.10(typescript@5.6.3): + vue-tsc@2.2.0(typescript@5.7.2): dependencies: - '@volar/typescript': 2.4.10 - '@vue/language-core': 2.1.10(typescript@5.6.3) - semver: 7.6.3 - typescript: 5.6.3 + '@volar/typescript': 2.4.11 + '@vue/language-core': 2.2.0(typescript@5.7.2) + typescript: 5.7.2 - vue@3.5.13(typescript@5.6.3): + vue@3.5.13(typescript@5.7.2): dependencies: '@vue/compiler-dom': 3.5.13 '@vue/compiler-sfc': 3.5.13 '@vue/runtime-dom': 3.5.13 - '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.6.3)) + '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.7.2)) '@vue/shared': 3.5.13 optionalDependencies: - typescript: 5.6.3 + typescript: 5.7.2 w3c-xmlserializer@5.0.0: dependencies: @@ -5621,7 +5888,7 @@ snapshots: whatwg-mimetype@4.0.0: {} - whatwg-url@14.0.0: + whatwg-url@14.1.0: dependencies: tr46: 5.0.0 webidl-conversions: 7.0.0 diff --git a/web/src/assets/locales/it.json b/web/src/assets/locales/it.json index 3b4753946..8b4a2a7d3 100644 --- a/web/src/assets/locales/it.json +++ b/web/src/assets/locales/it.json @@ -144,8 +144,8 @@ "add": "Aggiungi repository", "branches": "Rami", "deploy_pipeline": { - "enter_target": "Ambiente di destinazione del deploy", - "title": "Avvia evento di deploy per la pipeline corrente #{pipelineId}", + "enter_target": "Ambiente di destinazione della 'distribuzione'", + "title": "Avvia evento di 'distribuzione' per la pipeline corrente #{pipelineId}", "trigger": "Distribuzione", "variables": { "add": "Aggiungi variabile", @@ -196,13 +196,13 @@ }, "no_pipelines": "Non è ancora stata attivata alcuna pipeline.", "pipelines_for": "Pipeline per ramo \"{branch}\"", - "files": "File modificati ({files})", + "files": "File modificati", "no_pipeline_steps": "Nessuno step disponibile nella pipeline!", "step_not_started": "Questo step non è ancora iniziato.", "config": "Configurazione", "tasks": "Attività", "log_delete_confirm": "Vuoi davvero eliminare i registri attività di questo step?", - "errors": "Errori ({count})", + "errors": "Errori", "protected": { "awaits": "Questa pipeline è in attesa di approvazione da parte di un manutentore!", "approve": "Approva", @@ -225,7 +225,7 @@ "declined": "rifiutata", "error": "errore" }, - "warnings": "Avvertenze ({count})", + "warnings": "Avvertenze", "show_errors": "Mostra errori", "we_got_some_errors": "Oh no, si sono verificati degli errori!", "event": { @@ -321,7 +321,7 @@ "desc": "Ogni pipeline deve essere approvata prima di essere eseguita." }, "save": "Salva impostazioni", - "success": "Impostazioni della repository aggiornate", + "success": "Impostazioni del progetto aggiornate", "timeout": { "minutes": "minuti", "timeout": "Scadenza" @@ -342,24 +342,36 @@ "visibility": "Visibilità progetto" }, "cancel_prev": { - "desc": "Consente di annullare le pipeline in sospeso e in esecuzione dello stesso evento e contesto prima di avviare quella appena attivata.", + "desc": "I trigger di evento selezionati annulleranno le pipeline in sospeso e in esecuzione dello stesso evento prima di avviare quello più recente.", "cancel": "Annulla pipeline precedenti" }, "trusted": { "desc": "I container eseguiti dalle pipeline ottengono accesso a funzionalità avanzate (come il montaggio di volumi).", - "trusted": "Attendibile" + "trusted": "Attendibile", + "network": { + "network": "Rete", + "desc": "I container di pipeline ottengono l'accesso ai privilegi di rete, come la modifica del DNS." + }, + "volumes": { + "volumes": "Volumi", + "desc": "I container di pipeline possono montare volumi." + }, + "security": { + "security": "Sicurezza", + "desc": "I container di pipeline ottengono l'accesso ai privilegi di sicurezza." + } }, "allow_pr": { "allow": "Consenti Richieste di Modifica", - "desc": "Le pipeline possono essere eseguite su richieste di modifica." + "desc": "Consenti l'esecuzione di pipeline sulle richieste di modifica." }, "allow_deploy": { - "allow": "Consenti deployment", - "desc": "Consenti deployment da pipeline completate con successo. Utilizza solo se ti fidi di tutti gli utenti con accesso push." + "allow": "Consenti eventi di 'distribuzione'.", + "desc": "Consenti 'distribuzione' per le pipeline riuscite. Tutti gli utenti con autorizzazioni push possono attivarli, da usare con cautela." }, "netrc_only_trusted": { - "netrc_only_trusted": "Inietta le credenziali netrc solo nei container attendibili", - "desc": "Inietta le credenziali netrc solo nei contenitori attendibili (consigliato)." + "netrc_only_trusted": "Estensioni personalizzate affidabili per clone", + "desc": "Le estensioni elencate qui avranno accesso alle credenziali netrc che possono essere utilizzate per clonare i repository dal forge o inviarvi il push." } }, "not_allowed": "Non ti è consentito accedere alle impostazioni di questa repository", @@ -395,14 +407,30 @@ "branch": "Ramo" } }, - "user_none": "L'organizzazione / utente non ha ancora alcun progetto." + "user_none": "L'organizzazione / utente non ha ancora alcun progetto.", + "visibility": { + "visibility": "Visibilità progetto", + "public": { + "public": "Pubblico", + "desc": "Ogni utente può vedere il tuo progetto senza aver effettuato l'accesso." + }, + "private": { + "private": "Privato", + "desc": "Solo tu e gli altri proprietari del repository possono visualizzare questo progetto." + }, + "internal": { + "internal": "Interno", + "desc": "Solo gli utenti autenticati dell'istanza di Woodpecker possono visualizzare questo progetto." + } + } }, "repos": "Repository", "repositories": "Repository", "search": "Cerca…", "time": { "not_started": "non ancora iniziato", - "template": "MMM D, YYYY, HH:mm z" + "template": "MMM D, YYYY, HH:mm z", + "just_now": "poco fa" }, "unknown_error": "Si è verificato un errore sconosciuto", "url": "URL", @@ -528,5 +556,16 @@ "saved": "Credenziali di registro salvate", "deleted": "Credenziali di registro eliminate" }, - "login_with": "Accedi con {forge}" + "login_with": "Accedi con {forge}", + "all_repositories": "Tutti i repository", + "no_search_results": "Nessun risultato trovato", + "require_approval": { + "forks": "Richieste di modifica dal repository derivato", + "desc": "Impedisci alle pipeline dannose di esporre segreti o eseguire attività dannose approvandole prima dell'esecuzione.", + "require_approval_for": "Requisiti di approvazione", + "none": "Nessuno", + "pull_requests": "Tutte le richieste di modifica", + "all_events": "Tutti gli eventi del forge", + "none_desc": "Ogni evento attiva le pipeline, incluse le richieste di modifica. Questa impostazione può essere pericolosa ed è consigliata solo per le istanze private." + } } diff --git a/web/src/assets/locales/zh-Hans.json b/web/src/assets/locales/zh-Hans.json index 6c53ac028..8e4f296bc 100644 --- a/web/src/assets/locales/zh-Hans.json +++ b/web/src/assets/locales/zh-Hans.json @@ -194,7 +194,8 @@ "title": "添加流水线变量", "value": "变量值", "delete": "删除变量" - } + }, + "enter_task": "部署任务" }, "enable": { "disabled": "已禁用", @@ -215,7 +216,8 @@ "title": "添加流水线变量", "value": "变量值", "delete": "删除变量" - } + }, + "show_pipelines": "查看流水线" }, "not_allowed": "你没有权限访问这个仓库", "open_in_forge": "在版本控制系统中打开", @@ -436,7 +438,22 @@ }, "settings": "设置" }, - "user_none": "此组织/用户还没有任何仓库。" + "user_none": "此组织/用户还没有任何仓库。", + "visibility": { + "visibility": "项目可见性", + "public": { + "desc": "任何无需登录的用户均可以看到你的项目。", + "public": "公共的" + }, + "private": { + "private": "私有的", + "desc": "只有你和其他仓库拥有者才能看到这个项目。" + }, + "internal": { + "internal": "内部的", + "desc": "只有Woodpecker的登录用户可以看到这个项目。" + } + } }, "repos": "仓库", "repositories": "仓库", @@ -527,5 +544,6 @@ "cli_login_failed": "登录到 CLI 失败", "cli_login_denied": "登录 CLI 被拒绝", "login_to_cli_description": "点击继续以登录到 CLI。", - "return_to_cli": "您现在可以关闭此选项卡并返回 CLI。" + "return_to_cli": "您现在可以关闭此选项卡并返回 CLI。", + "login_with": "使用 {forge} 登录" } diff --git a/web/src/components/atomic/Icon.vue b/web/src/components/atomic/Icon.vue index 2c43236aa..facac554f 100644 --- a/web/src/components/atomic/Icon.vue +++ b/web/src/components/atomic/Icon.vue @@ -1,59 +1,59 @@