Explorar o código

fix: pass platform and correctly release (#952)

Baptiste Augrain %!s(int64=3) %!d(string=hai) anos
pai
achega
851b5f2659

+ 6 - 5
.github/workflows/linux.yml

@@ -103,6 +103,7 @@ jobs:
     needs: release
     needs: release
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest
     strategy:
     strategy:
+      fail-fast: false
       matrix:
       matrix:
         platform:
         platform:
         - amd64
         - amd64
@@ -114,6 +115,7 @@ jobs:
       - name: Check version
       - name: Check version
         run: ./stores/snapcraft/check_version.sh
         run: ./stores/snapcraft/check_version.sh
         env:
         env:
+          ARCHITECTURE: ${{ matrix.platform }}
           SNAP_STORE_LOGIN: ${{ secrets.SNAP_STORE_LOGIN }}
           SNAP_STORE_LOGIN: ${{ secrets.SNAP_STORE_LOGIN }}
 
 
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-qemu-action@v1
@@ -126,9 +128,8 @@ jobs:
         id: build
         id: build
         if: env.SHOULD_DEPLOY == 'yes'
         if: env.SHOULD_DEPLOY == 'yes'
 
 
-      - uses: snapcore/action-publish@v1
-        with:
-          store_login: ${{ secrets.SNAP_STORE_LOGIN }}
-          snap: ${{ steps.build.outputs.snap }}
-          release: stable
+      - name: Release snap
+        run: ./stores/snapcraft/release.sh
+        env:
+          SNAP_STORE_LOGIN: ${{ secrets.SNAP_STORE_LOGIN }}
         if: env.SHOULD_DEPLOY == 'yes'
         if: env.SHOULD_DEPLOY == 'yes'

+ 0 - 1
stores/snapcraft/check_version.sh

@@ -17,7 +17,6 @@ else
 
 
   echo "$SNAP_STORE_LOGIN" | snapcraft login --with -
   echo "$SNAP_STORE_LOGIN" | snapcraft login --with -
 
 
-  ARCHITECTURE=$(dpkg --print-architecture)
   echo "Architecture: ${ARCHITECTURE}"
   echo "Architecture: ${ARCHITECTURE}"
 
 
   SNAP_VERSION=$(snapcraft list-revisions codium | grep -F stable* | grep ${ARCHITECTURE} | tr -s ' ' | cut -d ' ' -f 4)
   SNAP_VERSION=$(snapcraft list-revisions codium | grep -F stable* | grep ${ARCHITECTURE} | tr -s ' ' | cut -d ' ' -f 4)

+ 11 - 0
stores/snapcraft/release.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+CALLER_DIR=$( pwd )
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+
+snapcraft upload --release=stable *.snap
+
+cd "${CALLER_DIR}"