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.3 into main #39

Merged
merged 20 commits into from
Oct 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
8881c49
Add Charmhub docs link to metadata.yaml
barrettj12 May 3, 2023
48f5119
[ci] Add workflow to release to edge
barrettj12 May 10, 2023
e2e7502
Merge pull request #25 from juju/release-ci
wallyworld May 10, 2023
5818ef5
[ci/release] change $CHANNEL to $TRACK
barrettj12 May 10, 2023
082ea81
Merge pull request #26 from juju/release-ci2
wallyworld May 10, 2023
45ffc14
Update build_charms_with_cache.yaml to v4
carlcsaposs-canonical Jul 28, 2023
b613f09
Merge pull request #27 from carlcsaposs-canonical/patch-1
barrettj12 Jul 31, 2023
8181a2b
Updates github workflow to use Juju 3.1. 3.0 is no longer available.
Oct 13, 2023
5449946
Merge pull request #29 from manadart/3.2
manadart Oct 13, 2023
4630276
Merge pull request #30 from manadart/3.1
manadart Oct 13, 2023
95b789f
Merge branch 'upstream/3.1' into 3.2
Oct 13, 2023
0cc34c5
Updates installed version of Juju for workflows to 3.2, the version
Oct 13, 2023
d84c25a
Merge pull request #31 from manadart/3.2
manadart Oct 13, 2023
6b98013
Merge pull request #24 from juju/ch-docs
barrettj12 Oct 16, 2023
5036fa5
Merge 3.1 into 3.2
barrettj12 Oct 16, 2023
af6c621
Merge pull request #32 from barrettj12/merge-3.1-3.2
barrettj12 Oct 16, 2023
38cbd28
Merge pull request #33 from barrettj12/merge-3.2-3.3
barrettj12 Oct 16, 2023
79a0d52
ci: install Juju from 3.3/beta channel
barrettj12 Oct 16, 2023
af8e6fb
Merge pull request #34 from barrettj12/3.3-ci
barrettj12 Oct 16, 2023
ad156d8
Merge branch '3.3' into merge-3.3-main
barrettj12 Oct 16, 2023
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
46 changes: 45 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

build:
name: Build charms
uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v2
uses: canonical/data-platform-workflows/.github/workflows/build_charms_with_cache.yaml@v4
with:
artifact-name: charm-packed

Expand Down Expand Up @@ -93,3 +93,47 @@ jobs:
juju status

# TODO: test integration with dashboard / ha-proxy

release:
name: "Release to edge"
runs-on: ubuntu-latest
needs: [build, bootstrap]
if: github.event_name == 'push'

steps:
- name: Download packed charm
id: download
uses: actions/download-artifact@v3
with:
name: ${{ needs.build.outputs.artifact-name }}

- name: Select Charmhub channel
id: channel
shell: bash
run: |
set -x
case ${{ github.ref_name }} in
3.* | 4.*)
TRACK="${{ github.ref_name }}"
;;
master)
TRACK="latest"
;;
esac
echo "track=$TRACK" >> "$GITHUB_OUTPUT"

if [[ -z $TRACK ]]; then
echo "upload=false" >> "$GITHUB_OUTPUT"
else
echo "upload=true" >> "$GITHUB_OUTPUT"
fi


- name: Upload to Charmhub
if: steps.channel.outputs.upload == 'true'
env:
CHARMCRAFT_AUTH: ${{ secrets.CHARMCRAFT_AUTH }}
run: |
sudo snap install charmcraft --classic
charmcraft upload ${{ steps.download.outputs.download-path }}/*.charm \
--release ${{ steps.channel.outputs.track }}/edge
1 change: 1 addition & 0 deletions metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ description: |
of functionality of a Juju controller.
summary: |
The Juju controller.
docs: https://discourse.charmhub.io/t/10534
provides:
dashboard:
interface: juju-dashboard
Expand Down