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(builder)!: remove single-step non-strict install #1727

Merged
merged 17 commits into from
Jul 19, 2024

Conversation

lengau
Copy link
Collaborator

@lengau lengau commented Jul 15, 2024

This separates out the install step for non strict-dependencies builds as follows:

  1. Install from python-binary-packages
  2. Install (source-only) from python-packages
  3. Install (source-only) from requirements files and charm libs.

@lengau lengau marked this pull request as ready for review July 16, 2024 18:24
@lengau lengau requested review from a team and mr-cal July 18, 2024 16:08
@lengau lengau enabled auto-merge July 18, 2024 16:30
@lengau lengau disabled auto-merge July 18, 2024 16:30
charmcraft/charm_builder.py Outdated Show resolved Hide resolved
charmcraft/charm_builder.py Outdated Show resolved Hide resolved
@lengau lengau requested a review from a team July 18, 2024 16:53
@lengau lengau force-pushed the work/CRAFT-2848/multistep branch from 495effe to ef15af1 Compare July 18, 2024 17:01
@lengau lengau enabled auto-merge July 18, 2024 17:10
@lengau lengau disabled auto-merge July 19, 2024 16:31
renovate bot and others added 6 commits July 19, 2024 16:12
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| craft-archives | `==1.1.3` -> `==1.2.0` |
[![age](https://developer.mend.io/api/mc/badges/age/pypi/craft-archives/1.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/craft-archives/1.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/craft-archives/1.1.3/1.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/craft-archives/1.1.3/1.2.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Enabled.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update
again.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/canonical/charmcraft).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjEuMCIsInVwZGF0ZWRJblZlciI6IjM3LjQzMS40IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
If no keyring is available, fall back to using an ephemeral one.

Fixes #1717
The `config.options` section of `charmcraft.yaml` supports, from Juju
3.1, a type `secret` (this is currently missing from the documentation,
but the Juju team are addressing that now).

This adds support for that, so that Charmcraft 2.5 can be used to pack
charms that make use of this functionality.
This bumps only craft-providers and craft-store to match the minor
versions used by snapcraft 7.x
Allows Charmcraft 2.7+ to use skopeo urls directly when uploading an
oci-image resource.

Example:

```
$ charmcraft upload-resource lengau-test-charm example-image --image docker://ghcr.io/canonical/charmed-mysql:8.0.36-22.04_edge
Image not found locally. Passing path directly to skopeo.
Revision 6 created of resource 'example-image' for charm 'lengau-test-charm'.
$
```
@lengau lengau force-pushed the work/CRAFT-2848/multistep branch from bfa845b to 2aa2da7 Compare July 19, 2024 20:25
This reduces the chances of having pip install binary packages as
indirect dependencies.

Partial fix for #1473
@lengau lengau force-pushed the work/CRAFT-2848/multistep branch from a0ac848 to 889254f Compare July 19, 2024 20:28
@lengau lengau force-pushed the work/CRAFT-2848/multistep branch from d1bbf35 to 4e53292 Compare July 19, 2024 20:32
@lengau lengau merged commit 51a55f7 into main Jul 19, 2024
15 of 17 checks passed
@lengau lengau deleted the work/CRAFT-2848/multistep branch July 19, 2024 21:03
@lengau
Copy link
Collaborator Author

lengau commented Jul 19, 2024

Bypassing protections to merge - test failure is due to: #1743

@kimwnasptd
Copy link

The PR seems to not fully resolve the issue in #1664 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants