diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index 54c1b42..64661d4 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -419,10 +419,9 @@ jobs: snap: ${{ steps.build.outputs.snap }} isClassic: 'true' - - uses: snapcore/action-publish@master - env: - SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }} + - uses: svenstaro/upload-release-action@v2 with: - snap: ${{ steps.build.outputs.snap }} - release: stable - if: needs.check.outputs.SHOULD_DEPLOY == 'yes' + repo_name: ${{ env.ASSETS_REPOSITORY }} + repo_token: ${{ secrets.STRONGER_GITHUB_TOKEN }} + file: ${{ steps.build.outputs.snap }} + tag: ${{ env.RELEASE_VERSION }} diff --git a/stores/snapcraft/insider/snap/snapcraft.yaml b/stores/snapcraft/insider/snap/snapcraft.yaml index a376016..e08dcf3 100644 --- a/stores/snapcraft/insider/snap/snapcraft.yaml +++ b/stores/snapcraft/insider/snap/snapcraft.yaml @@ -16,8 +16,7 @@ parts: set -eu # Get .deb url wget --quiet https://api.github.com/repos/VSCodium/vscodium-insiders/releases -O latest.json - VERSION=$( jq -r 'sort_by(.tag_name)|last.tag_name' latest.json ) - DEB_URL=$( jq -r 'map(select(.tag_name == "'"${VERSION}"'"))|first.assets[].browser_download_url|select(endswith("'"_${SNAPCRAFT_TARGET_ARCH}.deb"'"))' latest.json ) + DEB_URL=$( jq -r 'map(select(.tag_name == "'"${RELEASE_VERSION}"'"))|first.assets[].browser_download_url|select(endswith("'"_${SNAPCRAFT_TARGET_ARCH}.deb"'"))' latest.json ) DEB_NAME=$( basename "${DEB_URL}" ) # Downloading .deb wget "${DEB_URL}" -O "${SNAPCRAFT_PART_INSTALL}/${DEB_NAME}" @@ -27,7 +26,7 @@ parts: rm -f latest.json rm -f "${SNAPCRAFT_PART_INSTALL}/${DEB_NAME}" # Set version - snapcraftctl set-version "${VERSION}" + snapcraftctl set-version "${RELEASE_VERSION/-*/}" # Prepare GUI mkdir -p "${SNAPCRAFT_PART_INSTALL}/meta/gui" cp "${SNAPCRAFT_PART_INSTALL}/usr/share/codium-insiders/resources/app/resources/linux/code.png" "${SNAPCRAFT_PART_INSTALL}/meta/gui/codium-insiders.png" @@ -93,13 +92,17 @@ parts: source: snap/local/bin mesa-patchelf: + after: + - electron-launch plugin: nil stage-packages: - - libgl1-mesa-dri + - libgl1-mesa-dri stage: - -usr/lib/${SNAPCRAFT_ARCH_TRIPLET}/dri mesa-no-patchelf: + after: + - electron-launch plugin: nil stage-packages: - libgl1-mesa-dri