Skip to content

[pull] main from jdx:main #662

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.

Sign up for GitHub

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

Merged
pull merged 10 commits into from
Sep 15, 2026
Merged

[pull] main from jdx:main #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
23ccf35
docs(dotfiles): explain encryption key setup and first-adoption confl…
jdx Sep 15, 2026
f41eb72
feat(dotfiles): resolve every sharing conflict in one command (#13233)
jdx Sep 15, 2026
536505c
chore(ci): stop renovate from proposing fedora major bumps (#13237)
jdx Sep 15, 2026
77be750
chore: drop the pkl dev dependency by upgrading hk to 2.0.0 (#13236)
jdx Sep 15, 2026
61401c7
fix(backend): list versions from the resolved backend, not the regist…
jdx Sep 15, 2026
000b59d
chore(deps): update ghcr.io/jdx/mise:alpine docker digest to 9af1743 …
renovate[bot] Sep 15, 2026
ac7fa29
feat(npm): add allow_exotic_deps for non-registry dependencies (#13231)
jdx Sep 15, 2026
29f653e
fix(dotfiles): keep a blanket conflict choice from aborting on a dire…
jdx Sep 15, 2026
148beb6
fix(dotfiles): hold an unsaved path instead of discarding --keep-loca…
jdx Sep 15, 2026
5fa99df
fix(brew): do not treat tap formula requirement symbols as dependenci…
waynehoover Sep 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@
"matchCurrentValue": "copr",
"enabled": false
},
{
"description": "fedora major bumps only take effect when the rpm/copr images are rebuilt at release time, so a broken base image surfaces mid-release rather than in PR CI (see the fedora 40 rollback in 8184bc9). Bump manually against the release path; digest updates stay enabled.",
"matchPackageNames": ["fedora"],
"matchManagers": ["dockerfile"],
"matchUpdateTypes": ["major"],
"enabled": false
},
{
"matchPackageNames": ["taiki-e/install-action"],
"matchManagers": ["github-actions"],
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-alpine.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ env:
jobs:
bump-alpine:
runs-on: ubuntu-latest
container: ghcr.io/jdx/mise:alpine@sha256:1a4fe933142e4cfb2fa7843bbae9b2f10290ccab1a58e260d947ab41da359f40
container: ghcr.io/jdx/mise:alpine@sha256:a826df7e06cb73e66107f1a65c1da7c512f532430c6067e90b7633b8c39e893e
timeout-minutes: 60
if: |
(github.event_name == 'release' &&
Expand Down
90 changes: 45 additions & 45 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading