Merge ~sajoupa/prometheus-snap:build-latest-stable into ~canonical-is-sa/prometheus-snap:prometheus2

Proposed by Laurent Sesquès
Status: Merged
Approved by: Barry Price
Approved revision: 507cc5ad965e7c263b4ea27c7f51332c7b5c9fd4
Merged at revision: 7b69fc8a8bd81641b36f231a952fd17a060cebb3
Proposed branch: ~sajoupa/prometheus-snap:build-latest-stable
Merge into: ~canonical-is-sa/prometheus-snap:prometheus2
Diff against target: 14 lines (+2/-1)
1 file modified
snapcraft.yaml (+2/-1)
Reviewer Review Type Date Requested Status
Barry Price Approve
Review via email: mp+365446@code.launchpad.net

Commit message

Fix the snap version to not have the 'v' prefix (e.g. v2.8.1)

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Barry Price (barryprice) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 7b69fc8a8bd81641b36f231a952fd17a060cebb3

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 7c24097..e67daa3 100644
3--- a/snapcraft.yaml
4+++ b/snapcraft.yaml
5@@ -31,7 +31,8 @@ parts:
6 export "GOPATH=$PWD/../go"
7 cd ../go/src/github.com/prometheus/prometheus/
8 version="$(git tag -l | grep -v '\-rc' | sort -V | tail -n 1)"
9- snapcraftctl set-version "$version"
10+ snap_version=$(echo $version | sed -e s/^v//)
11+ snapcraftctl set-version "$snap_version"
12 git checkout tags/$version
13 make build
14 install: |

Subscribers

People subscribed via source and target branches