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.2 into 3.3 #50

Merged
merged 5 commits into from
Oct 19, 2023
Merged

Merge 3.2 into 3.3 #50

merged 5 commits into from
Oct 19, 2023

Commits on Oct 18, 2023

  1. Fix CI

    - 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 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    d22aeba View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Merge pull request #46 from juju/fix-ci

    Fix CI
    barrettj12 authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    aa4b959 View commit details
    Browse the repository at this point in the history
  2. Merge 3.1 into 3.2

    barrettj12 committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    ebdd157 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #49 from juju/merge-3.1-3.2-20231019

    Merge 3.1 into 3.2
    barrettj12 authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    c731924 View commit details
    Browse the repository at this point in the history
  4. Merge 3.2 into 3.3

    barrettj12 committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    6d583a4 View commit details
    Browse the repository at this point in the history