From 3b6954231f3edcc98dfc5ebe6c92fa56193d6d28 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Sat, 18 Dec 2021 02:58:54 +0100
Subject: [PATCH] fix: detect version based on the architecture (#950)
---
.github/workflows/linux.yml | 2 ++
stores/snapcraft/check_version.sh | 10 +++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 6314df4..3f39d43 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -113,6 +113,8 @@ jobs:
- name: Check version
run: ./stores/snapcraft/check_version.sh
+ env:
+ SNAP_STORE_LOGIN: ${{ secrets.SNAP_STORE_LOGIN }}
- uses: docker/setup-qemu-action@v1
if: env.SHOULD_DEPLOY == 'yes'
diff --git a/stores/snapcraft/check_version.sh b/stores/snapcraft/check_version.sh
index 531d055..51d3e43 100755
--- a/stores/snapcraft/check_version.sh
+++ b/stores/snapcraft/check_version.sh
@@ -13,15 +13,19 @@ elif [[ "${GITHUB_EVENT_NAME}" == "push" ]]; then
else
echo "It's a cron"
- sudo curl -sS --unix-socket /run/snapd.socket http://localhost/v2/find\?q\=codium > snap_latest.json
- SNAP_VERSION=$(jq -r '.result|map(select(.id == "lIZWXTqmo6LFSts5Cgk2VPlNwtysZAeH"))|last.version' snap_latest.json)
+ echo "$SNAP_STORE_LOGIN" | snapcraft login --with -
+
+ ARCHITECTURE=$(dpkg --print-architecture)
+ echo "Architecture: ${ARCHITECTURE}"
+
+ SNAP_VERSION=$(snapcraft list-revisions codium | grep -F stable* | grep ${ARCHITECTURE} | tr -s ' ' | cut -d ' ' -f 4)
echo "Snap version: ${SNAP_VERSION}"
wget --quiet https://api.github.com/repos/VSCodium/vscodium/releases -O gh_latest.json
GH_VERSION=$(jq -r 'sort_by(.tag_name)|last.tag_name' gh_latest.json)
echo "GH version: ${GH_VERSION}"
- rm -f snap_latest.json gh_latest.json
+ rm -f gh_latest.json
if [[ "${SNAP_VERSION}" == "${GH_VERSION}" ]]; then
export SHOULD_DEPLOY="no"