Misc backports (5.21-edge) (#521)

Those were found to be missing (not yet backported) while working on the backports for `5.0-edge`.
canonical · Jul 17, 2024 · 3f7167f · 3f7167f
2 parents a80793e + 20e1d96
commit 3f7167f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -7,6 +7,13 @@ updates:
       interval: "weekly"
 
   # XXX: also check on other (non-default) edge branches
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    labels: []
+    schedule:
+      interval: "weekly"
+    target-branch: "5.21-edge"
+
   - package-ecosystem: "github-actions"
     directory: "/"
     labels: []

diff --git a/snapcraft.yaml b/snapcraft.yaml
@@ -1041,6 +1041,7 @@ parts:
     source-tag: v1.10.1
     source-type: git
     plugin: rust
+    rust-channel: stable
     build-packages:
       - cargo
       - libseccomp-dev
@@ -1286,6 +1287,7 @@ parts:
 
   lxcfs:
     source: https://github.com/lxc/lxcfs
+    source-branch: stable-6.0
     source-depth: 1
     source-type: git
     build-packages: