From 90a7763ac68bd36b1afae9078f71e052dfb46b30 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Wed, 15 Jun 2022 10:00:56 +0100 Subject: [PATCH] snap: Fix debug cli option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `snap`/`snapcraft` seems to have changed recently. Since `snap` auto-updates all `snap` packages and since we use the `snapcraft` `snap` for building snaps, this is impacting all our CI jobs which now show: ``` Installing Snapcraft for Linux… snapcraft 7.0.4 from Canonical* installed Run snapcraft -d snap --destructive-mode Usage: snapcraft [options] command [args]... Try 'snapcraft pack -h' for help. Error: unrecognized arguments: -d Error: Process completed with exit code 1. ``` Move the debug option to make it a sub-command (long) option to resolve this issue. Fixes: #4457. Signed-off-by: James O. D. Hunt --- .github/workflows/snap-release.yaml | 2 +- .github/workflows/snap.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snap-release.yaml b/.github/workflows/snap-release.yaml index bae353cad2..2fde90afc4 100644 --- a/.github/workflows/snap-release.yaml +++ b/.github/workflows/snap-release.yaml @@ -26,7 +26,7 @@ jobs: # Check semantic versioning format (x.y.z) and if the current tag is the latest tag if echo "${current_version}" | grep -q "^[[:digit:]]\+\.[[:digit:]]\+\.[[:digit:]]\+$" && echo -e "$latest_version\n$current_version" | sort -C -V; then # Current version is the latest version, build it - snapcraft -d snap --destructive-mode + snapcraft snap --debug --destructive-mode fi - name: Upload snap diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml index ec968dc48f..9176d45d2a 100644 --- a/.github/workflows/snap.yaml +++ b/.github/workflows/snap.yaml @@ -24,4 +24,4 @@ jobs: - name: Build snap if: ${{ !contains(github.event.pull_request.labels.*.name, 'force-skip-ci') }} run: | - snapcraft -d snap --destructive-mode + snapcraft snap --debug --destructive-mode