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
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7d53472..1902c90 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -66,7 +66,7 @@ parts:
66################################################################################66################################################################################
67# Upstream: https://kernel.ubuntu.com/git/hwe/fwts.git/plain/snapcraft.yaml67# Upstream: https://kernel.ubuntu.com/git/hwe/fwts.git/plain/snapcraft.yaml
68 fwts:68 fwts:
69 source-tag: "V21.03.00"69 source-tag: ""
70 source-depth: 170 source-depth: 1
71 plugin: autotools71 plugin: autotools
72 source: git://kernel.ubuntu.com/hwe/fwts72 source: git://kernel.ubuntu.com/hwe/fwts
@@ -92,7 +92,7 @@ parts:
92################################################################################92################################################################################
93# Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml93# Upstream: https://kernel.ubuntu.com/git/cking/stress-ng.git/plain/snap/snapcraft.yaml
94 stress-ng:94 stress-ng:
95 source-tag: "V0.12.07"95 source-tag: ""
96 source-depth: 196 source-depth: 1
97 plugin: make97 plugin: make
98 source: git://kernel.ubuntu.com/cking/stress-ng98 source: git://kernel.ubuntu.com/cking/stress-ng
@@ -103,13 +103,13 @@ parts:
103 - make103 - make
104 - zlib1g-dev104 - zlib1g-dev
105 - libbsd-dev105 - libbsd-dev
106 - libattr1-dev
107 - libgcrypt20-dev106 - libgcrypt20-dev
108 - libkeyutils-dev107 - libkeyutils-dev
109 - libapparmor-dev108 - libapparmor-dev
110 - libaio-dev109 - libaio-dev
111 - libcap-dev110 - libcap-dev
112 - libsctp-dev111 - libsctp-dev
112 - libjudy-dev
113 after: [fwts]113 after: [fwts]
114################################################################################114################################################################################
115# Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml115# Upstream: https://kernel.ubuntu.com/git/cking/snapcraft-snaps.git/tree/acpica/snapcraft.yaml

Subscribers

People subscribed via source and target branches