Split bases

.github/workflows/release-edge.yaml

@@ -21,7 +21,7 @@ jobs:
       - name: Render k8s Charm
         run: tox -e render-k8s
       - name: Pack Artifact
-        run: sudo apt-get update && sudo apt-get install tar && tar czvf artifact.tar.gz metadata.yaml src/charm.py
+        run: sudo apt-get update && sudo apt-get install tar && tar czvf artifact.tar.gz charmcraft.yaml metadata.yaml src/charm.py
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

.gitignore

@@ -1,12 +1,14 @@
 venv/
 build/
 *.charm
+*.orig
 .coverage
 __pycache__/
 *.py[cod]
 .tox
 .idea/
 tests/integration/*-tester/lib/
+charmcraft.yaml
 metadata.yaml
 src/charm.py
 .env

charmcraft.yaml → k8s_charmcraft.yaml

@@ -11,9 +11,6 @@ bases:
     - name: "ubuntu"
       channel: "22.04"
       architectures: ["amd64"]
-    - name: "ubuntu"
-      channel: "20.04"
-      architectures: ["amd64"]
 parts:
   charm:
     build-packages:

machine_charmcraft.yaml

@@ -0,0 +1,34 @@
+# Copyright 2021 Canonical Ltd.
+# See LICENSE file for licensing details.
+
+type: charm
+bases:
+  - build-on:
+    - name: "ubuntu"
+      channel: "20.04"
+      architectures: ["amd64"]
+    run-on:
+    - name: "ubuntu"
+      channel: "20.04"
+      architectures: ["amd64"]
+  - build-on:
+    - name: "ubuntu"
+      channel: "22.04"
+      architectures: ["amd64"]
+    run-on:
+    - name: "ubuntu"
+      channel: "22.04"
+      architectures: ["amd64"]
+parts:
+  charm:
+    build-packages:
+    - git
+
+    # The following are needed for tls-certificates-interface
+    - build-essential
+    - python3-dev
+    - libffi-dev
+    - libssl-dev
+    - pkg-config
+    - rustc
+    - cargo

tox.ini

@@ -44,6 +44,7 @@ allowlist_externals = cp
 commands =
     cp {toxinidir}/src/k8s_charm.py {toxinidir}/src/charm.py
     cp {toxinidir}/k8s_metadata.yaml {toxinidir}/metadata.yaml
+    cp {toxinidir}/k8s_charmcraft.yaml {toxinidir}/charmcraft.yaml
 
 [testenv:render-machine]
 skip_install=True
@@ -55,6 +56,7 @@ commands =
     cp {toxinidir}/src/machine_charm.py {toxinidir}/src/charm.py
     chmod +x {toxinidir}/src/charm.py
     cp {toxinidir}/machine_metadata.yaml {toxinidir}/metadata.yaml
+    cp {toxinidir}/machine_charmcraft.yaml {toxinidir}/charmcraft.yaml
 
 [testenv:lint]
 skip_install=True
@@ -141,6 +143,7 @@ commands =
     # use a better solution when we actually have machine code
     cp {[vars]src_path}/k8s_charm.py {[vars]src_path}/charm.py
     cp k8s_metadata.yaml metadata.yaml
+    cp k8s_charmcraft.yaml charmcraft.yaml
 
     pytest -v --tb native --log-cli-level=INFO -s {posargs} {[vars]tst_path}/integration
 
@@ -162,6 +165,7 @@ allowlist_externals = cp
 commands =
     cp {[vars]src_path}/machine_charm.py {[vars]src_path}/charm.py
     cp machine_metadata.yaml metadata.yaml
+    cp machine_charmcraft.yaml charmcraft.yaml
     pytest -vv --tb native --log-cli-level=INFO -s {posargs} {[vars]tst_path}/scenario/test_machine_charm --ignore {[vars]tst_path}/scenario/test_k8s
 
 [testenv:scenario-k8s]