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.5 into 3.6 #82

Merged
merged 11 commits into from
Nov 10, 2024
Merged

chore: merge 3.5 into 3.6 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bac5d77
feat: adds 24.04 as a supported Ubuntu base.
manadart Jun 7, 2024
e172846
Merge pull request #75 from juju/3.4-lts-support
jack-w-shaw Jun 7, 2024
4419ff1
Merge branch '3.4' into 3.4-into-3.5
manadart Jun 12, 2024
cead5b3
Merge pull request #76 from juju/3.4-into-3.5
manadart Jun 12, 2024
62422e1
fix: adds Cargo as a build dependency to charmcraft.yaml.
manadart Oct 5, 2024
5856631
Merge pull request #78 from juju/3.5-charmcraft-cargo
manadart Oct 8, 2024
e5b9963
fix: adds Cargo as a build dependency to charmcraft.yaml.
manadart Oct 5, 2024
55fc19d
fix: use charmcraft 2.x to build
manadart Nov 8, 2024
a5274b6
Merge pull request #81 from juju/3.5-charmcraft-cargo
manadart Nov 8, 2024
8bceb7d
fix: use Juju 3.6 for tests
manadart Nov 8, 2024
ab25b1f
fix: replace aarch46 with ppc64el
manadart Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
needs: unit-tests
uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v4
with:
charmcraft-snap-channel: 2.x/stable
artifact-name: charm-packed


Expand Down Expand Up @@ -93,7 +94,7 @@ jobs:
env:
CHARMCRAFT_AUTH: ${{ secrets.CHARMCRAFT_AUTH }}
run: |
sudo snap install charmcraft --classic
sudo snap install charmcraft --channel 2.x/stable --classic
charmcraft upload ${{ steps.download.outputs.download-path }}/*.charm \
--name $CHARM_NAME \
--release ${{ needs.channel.outputs.test }}
Expand Down Expand Up @@ -143,7 +144,7 @@ jobs:

- name: Install Juju
run: |
sudo snap install juju --channel 3.3/beta
sudo snap install juju --channel 3.6/candidate

- name: Bootstrap on LXD
if: matrix.cloud == 'lxd'
Expand Down Expand Up @@ -179,7 +180,7 @@ jobs:
steps:
- name: Install Charmcraft
run: |
sudo snap install charmcraft --classic
sudo snap install charmcraft --channel 2.x/stable --classic

- name: Get uploaded revision
id: revision
Expand Down
13 changes: 11 additions & 2 deletions charmcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,32 @@ type: charm
parts:
charm:
charm-python-packages: [setuptools,markdown]
build-packages:
- cargo
bases:
- build-on:
- name: ubuntu
channel: "22.04"
architectures: ["amd64"]
run-on:
- name: ubuntu
channel: "24.04"
architectures:
- amd64
- arm64
- s390x
- ppc64el
- name: ubuntu
channel: "22.04"
architectures:
- amd64
- aarch64
- arm64
- s390x
- ppc64el
- name: ubuntu
channel: "20.04"
architectures:
- amd64
- aarch64
- arm64
- s390x
- ppc64el
Loading