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

Merge 3.1 into 3.2 #49

Merged
merged 3 commits into from
Oct 19, 2023
Merged

Merge 3.1 into 3.2 #49

merged 3 commits into from
Oct 19, 2023

Conversation

barrettj12
Copy link
Contributor

Merges the following patches:

Conflicts

None.

barrettj12 and others added 3 commits October 18, 2023 16:18
- upload charm to temporary branch for testing
- cross-release to edge on push
- Add separate CI job to select Charmhub channels
- Upload the charm in a separate job, outside of the integration tests.
- Rename the `bootstrap` job to `integration`.
- Disable CI runs on `pull_request`
- Introduce a `CHARM_NAME` variable, which can be set on a fork to upload the charm to a different URL.
- Allow overriding the charm name in the `charmcraft_tokengen.sh` script
@barrettj12 barrettj12 merged commit c731924 into 3.2 Oct 19, 2023
9 checks passed
@barrettj12 barrettj12 deleted the merge-3.1-3.2-20231019 branch October 19, 2023 02:26
This was referenced Oct 19, 2023
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.

2 participants