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.

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

Jump to bottom

chore: merge 3.6 to main with charmcraft 3 #85

Draft
wants to merge 20 commits into
base: main
Choose a base branch
from
Draft

chore: merge 3.6 to main with charmcraft 3 #85

wants to merge 20 commits into from

Commits on Feb 7, 2024

  1. Uses BlockedStatus instead of ErrorStatus, which when set explicitly 

    results in an error with the new version of Ops.
    @manadart
    manadart committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    6cd096b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #62 from juju/3.3-fix-status 

    Uses BlockedStatus instead of ErrorStatus
    @manadart
    manadart authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    470f7c5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #63 from juju/3.3-into-3.4 

    Merge 3.3 into 3.4
    @manadart
    manadart authored Feb 7, 2024
    Configuration menu
    Copy the full SHA
    245bac2 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2024

  1. Updates charm metadata with correct Juju version restriction.

    @manadart
    manadart committed Feb 10, 2024
    Configuration menu
    Copy the full SHA
    209f9c8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #64 from juju/3.4-into-3.5 

    Merge 3.4 into 3.5
    @manadart
    manadart authored Feb 10, 2024
    Configuration menu
    Copy the full SHA
    5ac10db View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. feat: adds 24.04 as a supported Ubuntu base.

    @manadart
    manadart committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    bac5d77 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #75 from juju/3.4-lts-support 

    feat: add 24.04 as a supported Ubuntu base
    @jack-w-shaw
    jack-w-shaw authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    e172846 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Merge branch '3.4' into 3.4-into-3.5

    @manadart
    manadart committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    4419ff1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #76 from juju/3.4-into-3.5 

    chore: merge 3.4 into 3.5
    @manadart
    manadart authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    cead5b3 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. fix: adds Cargo as a build dependency to charmcraft.yaml. 

    This required in order to build the binary wheel(s) required by the
included COS libs.
    @manadart
    manadart committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    62422e1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #78 from juju/3.5-charmcraft-cargo 

    fix: add Cargo as a build dependency
    @manadart
    manadart authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    5856631 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. fix: adds Cargo as a build dependency to charmcraft.yaml. 

    This required in order to build the binary wheel(s) required by the
included COS libs.
    @manadart
    manadart committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    e5b9963 View commit details
    Browse the repository at this point in the history

  2. fix: use charmcraft 2.x to build 

    Version 3 of charmcraft does not allow a run-on stanza that includes
24.04 with other versions, but 2 does. So we install this versions for
   our Github workflows.
    @manadart
    manadart committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    55fc19d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #81 from juju/3.5-charmcraft-cargo 

    fix: add Cargo as a build dependency to charmcraft.yaml
    @manadart
    manadart authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    a5274b6 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2024

  1. fix: use Juju 3.6 for tests 

    Testing on an old version was vestigial.
    @manadart
    manadart committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    8bceb7d View commit details
    Browse the repository at this point in the history

  2. fix: replace aarch46 with ppc64el 

    Not sure how we ended up with this list of architectures.
    @manadart
    manadart committed Nov 10, 2024
    Configuration menu
    Copy the full SHA
    ab25b1f View commit details
    Browse the repository at this point in the history

  3. Merge pull request #82 from juju/3.5-into-3.6 

    chore: merge 3.5 into 3.6
    @manadart
    manadart authored Nov 10, 2024
    Configuration menu
    Copy the full SHA
    55add98 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2024

  1. chore: use charmcraft 3 

    We can only currently build for one base, but we can remote build on launchpad
and thus get builds for all supported arches.
    @wallyworld
    wallyworld committed Nov 12, 2024
    Configuration menu
    Copy the full SHA
    c257e17 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2024

  1. Merge commit 'c257e1750b7b44e101bc49c9ea985994358a9ac5' into charmcraft3

    @hpidcock
    hpidcock committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    ce266fa View commit details
    Browse the repository at this point in the history

  2. test: fix blocked status and blocked status tests

    @hpidcock
    hpidcock committed Nov 21, 2024
    Configuration menu
    Copy the full SHA
    e5204f9 View commit details
    Browse the repository at this point in the history