Fix problems with snap release (#7239)

Cherry-pick 2022464.
Azure · Mar 16, 2024 · 40e4fdd · 40e4fdd
1 parent 42295cc
commit 40e4fdd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/builds/misc/packages-release.yaml b/builds/misc/packages-release.yaml
@@ -167,7 +167,7 @@ stages:
     - script: |
         sudo snap install snapcraft --classic
         lxd init --minimal
-        snapcraft --use-lxd
+        SNAPCRAFT_BUILD_INFO=1 snapcraft --use-lxd
       displayName: Build snap
       env:
         SNAPCRAFT_BUILD_INFO: 1
@@ -378,8 +378,7 @@ stages:
         sudo snap install snapcraft --classic
         for pkg in $(ls $(System.ArtifactsDirectory)/**/*.snap)
         do
-          # TODO: change release channel from 'edge' to 'stable'
-          snapcraft upload --release=edge "$pkg"
+          snapcraft upload --release=stable "$pkg"
         done
 
         logdir='$(Build.ArtifactStagingDirectory)/logs'

diff --git a/builds/misc/templates/build-packages.yaml b/builds/misc/templates/build-packages.yaml
@@ -164,7 +164,7 @@ stages:
           - script: |
               sudo snap install snapcraft --classic
               lxd init --minimal
-              snapcraft --use-lxd
+              SNAPCRAFT_BUILD_INFO=1 snapcraft --use-lxd
             displayName: Build snap
             condition: eq(${{ parameters['E2EBuild'] }}, false)
           - task: CopyFiles@2

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -54,7 +54,7 @@ parts:
       rm -rf $CRAFT_PART_BUILD/target
       SC_VERSION="$(cat $CRAFT_PART_SRC/version.txt)"
       craftctl set version="$SC_VERSION"
-      # if version contains substing "dev" set grade to devel, else stable
+      # if version contains substring "dev" set grade to devel, else stable
       if test "${SC_VERSION#*dev}" != "$SC_VERSION" ; then
         craftctl set grade=devel
       else