From 0f3686678010e35d49d00b8f23fe76c09bf469be Mon Sep 17 00:00:00 2001 From: Samuel Allan Date: Thu, 24 Oct 2024 15:50:11 +1030 Subject: [PATCH 1/2] Update to charmcraft 3 Fixes: #95 --- .github/workflows/check.yaml | 2 +- .github/workflows/promote.yaml | 2 +- .github/workflows/release.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index da1aa60..8901259 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -96,7 +96,7 @@ jobs: - name: install external controller required packages run: | - sudo snap install charmcraft --channel 2.x/stable --classic + sudo snap install charmcraft --channel 3.x/stable --classic sudo snap install juju --channel 3.4/stable --classic sudo --preserve-env=http_proxy,https_proxy,no_proxy pip3 install tox juju switch soleng-ci-ctrl-34 diff --git a/.github/workflows/promote.yaml b/.github/workflows/promote.yaml index e6b4f64..cec897a 100644 --- a/.github/workflows/promote.yaml +++ b/.github/workflows/promote.yaml @@ -37,4 +37,4 @@ jobs: github-token: ${{ secrets.GITHUB_TOKEN }} destination-channel: ${{ steps.set-channels.outputs.destination-channel }} origin-channel: ${{ steps.set-channels.outputs.origin-channel }} - charmcraft-channel: "2.x/stable" + charmcraft-channel: "3.x/stable" diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 539925c..ac1dc5c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -36,7 +36,7 @@ jobs: - name: Pack and upload to charmhub uses: canonical/charming-actions/upload-charm@2.6.2 with: - charmcraft-channel: "2.x/stable" + charmcraft-channel: "3.x/stable" credentials: "${{ secrets.CHARMHUB_TOKEN }}" github-token: "${{ secrets.GITHUB_TOKEN }}" # Ensure the charm is built in an isolated environment and on the correct base in an lxd container. From 6e09ddd5e288edf384acaf3f3f6c75624b78f03a Mon Sep 17 00:00:00 2001 From: Samuel Allan Date: Thu, 24 Oct 2024 16:11:44 +1030 Subject: [PATCH 2/2] add docs --- CONTRIBUTING.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 836415c..48df513 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,6 +57,12 @@ This script is also executed periodically as part of a GitHub Actions workflow t ## Build the charm +Charmcraft v3 is required to build this charm: + +``` +sudo snap install charmcraft --channel 3.x/stable --classic +``` + Build the charm in this git repository using: ```shell