Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix config loading of cli #3764

Merged
merged 6 commits into from
Jun 6, 2024
Merged

Conversation

anbraten
Copy link
Member

@anbraten anbraten commented Jun 6, 2024

closes #3739

closes #3763

  • fix config merging
  • disable update check in docker image

@anbraten anbraten added bug Something isn't working cli labels Jun 6, 2024
@anbraten anbraten requested a review from a team June 6, 2024 05:43
Copy link
Contributor

@qwerty287 qwerty287 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

untested

@qwerty287 qwerty287 added this to the 2.6.0 milestone Jun 6, 2024
@anbraten
Copy link
Member Author

anbraten commented Jun 6, 2024

Tested it locally and with docker again and seems to work for me now.

@anbraten anbraten enabled auto-merge (squash) June 6, 2024 09:41
@woodpecker-bot
Copy link
Collaborator

woodpecker-bot commented Jun 6, 2024

Deployment of preview was torn down

@anbraten anbraten merged commit 2c7edbf into woodpecker-ci:main Jun 6, 2024
7 checks passed
@woodpecker-bot woodpecker-bot mentioned this pull request Jun 6, 2024
1 task
6543 pushed a commit to 6543-forks/woodpecker that referenced this pull request Sep 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working cli
Projects
None yet
3 participants