snappy-hwe-snaps

Merge ~kzapalowicz/snappy-hwe-snaps/+git/tpm:fix/version-part into ~snappy-hwe-team/snappy-hwe-snaps/+git/tpm:master

  1. Git
  2. lp:~kzapalowicz/snappy-hwe-snaps/+git/tpm
  3. fix/version-part
  4. Merge into master
Proposed by Konrad Zapałowicz
Status: Merged
Approved by: Scott Sweeny
Approved revision: cd755714ffea9cd718a0114bf85956ca427475e5
Merged at revision: 0783d0a2fe731a453dc7ec08473ef9292fc7b786
Proposed branch: ~kzapalowicz/snappy-hwe-snaps/+git/tpm:fix/version-part
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/tpm:master
Diff against target: 13 lines (+1/-1)
1 file modified
snapcraft.yaml (+1/-1)
Reviewer Review Type Date Requested Status
System Enablement Bot continuous-integration Approve
Scott Sweeny (community) Approve
Review via email: mp+317667@code.launchpad.net

Commit message

fix "version" part being broken

the release script has updated the version of snap and sadly it
targeted all "version:" strings. This includes "version:" part
and snapcraft fails to build it now.

This commit fixes the situation

Description of the change

fix "version" part being broken

the release script has updated the version of snap and sadly it
targeted all "version:" strings. This includes "version:" part
and snapcraft fails to build it now.

This commit fixes the situation

To post a comment you must log in.
Revision history for this message
Scott Sweeny (ssweeny) wrote :

LGTM

review: Approve
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:cd755714ffea9cd718a0114bf85956ca427475e5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/969/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-run-snap-spread-tests/672
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/877/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/969/rebuild

review: Approve (continuous-integration)
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :

PASSED: Continuous integration, rev:cd755714ffea9cd718a0114bf85956ca427475e5
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/971/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/673
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/881/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/971/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snapcraft.yaml b/snapcraft.yaml
2index ccd75d3..9064637 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -12,7 +12,7 @@ apps:
6 command: sbin/tcsd -f -c $SNAP/etc/tcsd.conf
7 daemon: simple
8 plugs: [network-bind, tpm]
9- version: 1.2-4
10+ version:
11 command: sbin/tpm_version
12 plugs: [network]
13 aliases: [tpm_version]

Subscribers

People subscribed via source and target branches