From 1a5c7e1debd3be62035f7451dc1f9e7e2fd6c720 Mon Sep 17 00:00:00 2001
From: Pete Dyer <pete.dyer@izumanetworks.com>
Date: Mon, 30 Jan 2023 13:10:50 +0000
Subject: [PATCH] Update to version v1.21.2 (#416)

Pin the versions to be used for gyp inside maestro and maestro-shell
instead of using master.

Pin the version of yp instead of using master.
---
 snap/snapcraft.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7d68592e..2c027583 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: pelion-edge
 base: core
-version: "1.21.1"
+version: "1.21.2"
 summary: Pelion Edge
 description: Pelion Edge
 confinement: strict
@@ -358,6 +358,8 @@ parts:
         export GOPATH=${SNAPCRAFT_PART_BUILD}/go
         cd ${GOPATH}/src/github.com/armPelionEdge/maestro-shell/
         # Build maestro-shell dependencies
+        # Pin the version of gyp.git to be used
+        sed -i -e "s,build/gyp,build/gyp\n    cd build/gyp\n    git checkout d6c5dd51dc3a60bf4ff32a5256713690a1a10376\n    cd ../..,g" build-deps.sh
         ./build-deps.sh
         # Build maestro-shell
         go build github.com/armPelionEdge/maestro-shell
@@ -373,6 +375,7 @@ parts:
         - GOFLAGS:  "$GOFLAGS -modcacherw"
       source: https://github.com/mikefarah/yq.git
       go-importpath: github.com/mikefarah/yq
+      source-commit: 5911ab29297e530c69847cea591591cf36675a54
     maestro:
       plugin: go
       source: https://github.com/armPelionEdge/maestro.git
@@ -400,6 +403,8 @@ parts:
         export GOBIN=${GOPATH}/bin
         cd ${GOPATH}/src/github.com/armPelionEdge/maestro/
         # Build maestro dependencies
+        # Pin the version of gyp.git to be used
+        sed -i -e "s,build/gyp,build/gyp\n    cd build/gyp\n    git checkout d6c5dd51dc3a60bf4ff32a5256713690a1a10376\n    cd ../..,g" build-deps.sh
         DEBUG= ./build-deps.sh
         # Build maestro
         DEBUG= DEBUG2= ./build.sh