Checkbox Core

Merge ~sylvain-pineau/checkbox-core-snap:release18 into ~sylvain-pineau/checkbox-core-snap:master

  1. Git
  2. lp:~sylvain-pineau/checkbox-core-snap
  3. release18
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 48dde4b2742fa9d1190d5f0b15aa51e8d3a4eea0
Merge reported by: Sylvain Pineau
Merged at revision: 48dde4b2742fa9d1190d5f0b15aa51e8d3a4eea0
Proposed branch: ~sylvain-pineau/checkbox-core-snap:release18
Merge into: ~sylvain-pineau/checkbox-core-snap:master
Diff against target: 153 lines (+20/-20)
2 files modified
.bumpversion.cfg (+5/-5)
snap/snapcraft.yaml (+15/-15)
Reviewer Review Type Date Requested Status
Sylvain Pineau automated Approve
Review via email: mp+372717@code.launchpad.net

Commit message

Release_2019_Week37

Description of the change

Release_2019_Week37

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) :
review: Approve (automated)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.bumpversion.cfg b/.bumpversion.cfg
2index 5ea6ac2..8e5fad8 100644
3--- a/.bumpversion.cfg
4+++ b/.bumpversion.cfg
5@@ -1,15 +1,15 @@
6 [bumpversion]
7-current_version = 1.1.dev
8+current_version = 1.1
9 parse = (?P<major>\d+)\.(?P<minor>\d+)((?P<release>\.?[a-z]+))?
10 serialize =
11- {major}.{minor}{release}
12- {major}.{minor}
13+ {major}.{minor}{release}
14+ {major}.{minor}
15
16 [bumpversion:file:snap/snapcraft.yaml]
17
18 [bumpversion:part:release]
19 optional_value = RELEASE
20 values =
21- .dev
22- RELEASE
23+ .dev
24+ RELEASE
25
26diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
27index ccfc6ac..a38f7a2 100644
28--- a/snap/snapcraft.yaml
29+++ b/snap/snapcraft.yaml
30@@ -1,7 +1,7 @@
31 name: checkbox18
32 summary: Checkbox runtime and public providers
33 description: "Checkbox runtime and public providers"
34-version: '1.1.dev'
35+version: '1.1'
36 grade: stable
37
38 base: core18
39@@ -54,7 +54,7 @@ parts:
40 ################################################################################
41 # Upstream: https://kernel.ubuntu.com/git/hwe/fwts.git/plain/snapcraft.yaml
42 fwts:
43- source-tag: ""
44+ source-tag: "V19.03.00"
45 source-depth: 1
46 plugin: autotools
47 source: git://kernel.ubuntu.com/hwe/fwts
48@@ -78,7 +78,7 @@ parts:
49 ################################################################################
50 # Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
51 stress-ng:
52- source-tag: ""
53+ source-tag: "V0.09.58"
54 source-depth: 1
55 plugin: make
56 source: git://kernel.ubuntu.com/cking/stress-ng
57@@ -99,7 +99,7 @@ parts:
58 after: [plainbox-provider-checkbox]
59 ################################################################################
60 checkbox-support:
61- source-tag: ""
62+ source-tag: "snap-2019-05-06T1143"
63 source-depth: 1
64 plugin: python
65 source: git://git.launchpad.net/checkbox-support
66@@ -111,7 +111,7 @@ parts:
67 after: [fwts]
68 ################################################################################
69 checkbox-ng:
70- source-tag: ""
71+ source-tag: "snap-2019-05-06T1143"
72 source-depth: 1
73 plugin: python
74 source: git://git.launchpad.net/checkbox-ng
75@@ -127,7 +127,7 @@ parts:
76 - XlsxWriter
77 ################################################################################
78 plainbox-provider-resource:
79- source-tag: ""
80+ source-tag: "snap-2019-05-06T1143"
81 source-depth: 1
82 plugin: plainbox-provider
83 source: git://git.launchpad.net/plainbox-provider-resource
84@@ -151,7 +151,7 @@ parts:
85 after: [checkbox-support, checkbox-ng]
86 ################################################################################
87 plainbox-provider-checkbox:
88- source-tag: ""
89+ source-tag: "snap-2019-05-06T1143"
90 source-depth: 1
91 plugin: plainbox-provider
92 source: git://git.launchpad.net/plainbox-provider-checkbox
93@@ -203,7 +203,7 @@ parts:
94 after: [plainbox-provider-resource]
95 ################################################################################
96 plainbox-provider-snappy:
97- source-tag: ""
98+ source-tag: "snap-2019-05-06T1143"
99 source-depth: 1
100 plugin: plainbox-provider
101 source: git://git.launchpad.net/plainbox-provider-snappy
102@@ -228,31 +228,31 @@ parts:
103 after: [plainbox-provider-checkbox]
104 ################################################################################
105 plainbox-provider-ipdt:
106- source-tag: ""
107+ source-tag: "snap-2019-05-06T1143"
108 source-depth: 1
109 plugin: plainbox-provider
110 source: git://git.launchpad.net/plainbox-provider-ipdt
111 source-subdir: plainbox-provider-ipdt
112 stage-packages:
113- - util-linux
114+ - util-linux
115 after: [plainbox-provider-snappy]
116 ################################################################################
117 plainbox-provider-docker:
118- source-tag: ""
119+ source-tag: "snap-2019-05-06T1143"
120 source-depth: 1
121 plugin: plainbox-provider
122 source: git://git.launchpad.net/plainbox-provider-docker
123 after: [plainbox-provider-ipdt]
124 ################################################################################
125 plainbox-provider-tpm2:
126- source-tag: ""
127+ source-tag: "snap-2019-05-06T1143"
128 source-depth: 1
129 plugin: plainbox-provider
130 source: git://git.launchpad.net/plainbox-provider-tpm2
131 after: [plainbox-provider-docker]
132 ################################################################################
133 plainbox-provider-sru:
134- source-tag: ""
135+ source-tag: "snap-2019-03-08T0906"
136 source-depth: 1
137 plugin: plainbox-provider
138 source: git://git.launchpad.net/plainbox-provider-sru
139@@ -267,12 +267,12 @@ parts:
140 after: [plainbox-provider-sru]
141 ################################################################################
142 checkbox-provider-edgex:
143- source-tag: ""
144+ source-tag: "snap-2019-03-08T0906"
145 source-depth: 1
146 plugin: plainbox-provider
147 source: git://git.launchpad.net/checkbox-provider-edgex
148 stage-packages:
149- - curl
150+ - curl
151 after: [plainbox-provider-engineering-tests]
152 ################################################################################
153 i2c-tools:

Subscribers

People subscribed via source and target branches

to all changes: