fix space

Change-Id: Ibbafa6556bcf75965bd27ab44da5ee372ea872b0

Jenkinsfile

@@ -137,7 +137,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
             steps {
                 sh """git checkout ${params.CHANNEL}
                       # Submodules are generally not managed by merging
-                      git merge -X theirs --no-commit FETCH_HEAD || git add `git diff --name-status --diff-filter=U | awk '{print \$2}'`
+                      git merge -X theirs --no-commit FETCH_HEAD || git status && git add `git diff --name-status --diff-filter=U | awk '{print \$2}'` || true
                    """
             }
         }
@@ -156,6 +156,7 @@ See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration_client
             steps {
                 sh """\
 #!/usr/bin/env -S bash -l
+git status
 git commit -am 'New release.'
 make portable-release-tarball .tarball-version
 git tag \$(cat .tarball-version) -am "Jami \$(cat .tarball-version)"

docker/Dockerfile_snap

@@ -22,7 +22,12 @@ RUN unsquashfs -d /snap/core18/current core18.snap
 
 # Grab the snapcraft snap from the stable channel and unpack it in the proper
 # place.
-RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=stable' | jq '.download_url' -r) --output snapcraft.snap
+# RUN curl -L $(curl -H 'X-Ubuntu-Series: 16' 'https://api.snapcraft.io/api/v1/snaps/details/snapcraft?channel=stable' | jq '.download_url' -r) --output snapcraft.snap
+# Current snapcraft snap is broken upstream again:
+#   https://forum.snapcraft.io/t/snapcraft-docker-images-broken-again/27942
+# Temporary workaround: pin to an older, non-broken version for now.
+# TODO: restore to the above once issue is fixed upstream.
+RUN curl -L https://api.snapcraft.io/api/v1/snaps/download/vMTKRaLjnOJQetI78HjntT37VuoyssFE_6751.snap --output snapcraft.snap
 RUN mkdir -p /snap/snapcraft
 RUN unsquashfs -d /snap/snapcraft/current snapcraft.snap