Merge ~sylvain-pineau/checkbox-core-snap:revert-fwts-stress-ng-tags-dev into checkbox-core-snap:master

Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: eb4380828391533828bb0bba3e1223a6c9340310
Merged at revision: 8d6cac74d5e03e45e51a306d6eef8b60c5240569
Proposed branch: ~sylvain-pineau/checkbox-core-snap:revert-fwts-stress-ng-tags-dev
Merge into: checkbox-core-snap:master
Diff against target: 37 lines (+3/-3)
1 file modified
snap/snapcraft.yaml (+3/-3)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+404172@code.launchpad.net

Description of the change

Both fwts and stress-ng snap builds are back to normal (no FTBFS).

Time to revert using stable tags for the dev/edge versions of checkbox core snaps.

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

self-approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
2index 7d53472..1902c90 100644
3--- a/snap/snapcraft.yaml
4+++ b/snap/snapcraft.yaml
5@@ -66,7 +66,7 @@ parts:
6 ################################################################################
7 # Upstream: https://kernel.ubuntu.com/git/hwe/fwts.git/plain/snapcraft.yaml
8 fwts:
9- source-tag: "V21.03.00"
10+ source-tag: ""
11 source-depth: 1
12 plugin: autotools
13 source: git://kernel.ubuntu.com/hwe/fwts
14@@ -92,7 +92,7 @@ parts:
15 ################################################################################
16 # Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
17 stress-ng:
18- source-tag: "V0.12.07"
19+ source-tag: ""
20 source-depth: 1
21 plugin: make
22 source: git://kernel.ubuntu.com/cking/stress-ng
23@@ -103,13 +103,13 @@ parts:
24 - make
25 - zlib1g-dev
26 - libbsd-dev
27- - libattr1-dev
28 - libgcrypt20-dev
29 - libkeyutils-dev
30 - libapparmor-dev
31 - libaio-dev
32 - libcap-dev
33 - libsctp-dev
34+ - libjudy-dev
35 after: [fwts]
36 ################################################################################
37 # Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml

Subscribers

People subscribed via source and target branches