-
Notifications
You must be signed in to change notification settings - Fork 28
fix(project): handle devel bases in is_effective_base_eol() #1153
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
fab2ff7
fix(project): handle devel/unknown bases in is_effective_base_eol()
lengau 1da0cb1
fix(project): treat devel base as never EOL in is_effective_base_eol()
lengau 0a2d54e
test(spread): add ubuntu-26.04-64 to multipass backend
lengau 97d09b2
Merge branch 'main' into work/fix-1152
lengau File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| summary: test packing witchcraft with build-base devel and --ignore=unmaintained | ||
|
|
||
| # Regression test for https://github.com/canonical/craft-application/issues/1152 | ||
| # | ||
| # ProjectService.is_effective_base_eol() did not handle a build-base of "devel" | ||
| # (or any base unrecognized by distro-support), crashing with an unhandled | ||
| # UnknownVersionError. This is only exercised when the --ignore=unmaintained | ||
| # flag is used, since that's the only path calling is_effective_base_eol(). | ||
|
|
||
| execute: | | ||
| witchcraft pack --ignore=unmaintained --destructive-mode | ||
|
|
||
| if [[ $(find . -maxdepth 1 -name '*.witchcraft') == "" ]]; then | ||
| echo "No witchcraft file created" >> /dev/stderr | ||
| exit 1 | ||
| fi | ||
|
|
||
| restore: | | ||
| rm -f *.witchcraft |
21 changes: 21 additions & 0 deletions
21
tests/spread/witchcraft/pack-devel-build-base/witchcraft.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| name: eol-devel-test | ||
| version: "0.1" | ||
| summary: Test packing with a devel build-base and --ignore=unmaintained. | ||
| description: | | ||
| Regression test for https://github.com/canonical/craft-application/issues/1152 | ||
|
|
||
| This tests that witchcraft, which has check_supported_base enabled, can | ||
| pack a project with `base: bare` and `build-base: devel` when | ||
| `--ignore=unmaintained` is passed, without crashing with an | ||
| UnknownVersionError from distro-support. | ||
|
|
||
| base: bare | ||
| build-base: ubuntu@devel | ||
| platforms: | ||
| platform-independent: | ||
| build-on: [amd64, arm64, ppc64el, s390x, riscv64] | ||
| build-for: [all] | ||
|
|
||
| parts: | ||
| my-test: | ||
| plugin: nil |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A reasonable assumption!