diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index d4fe8f1..b1453fa 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -222,7 +222,8 @@ jobs: platform: - amd64 - arm64 - if: needs.build.outputs.SHOULD_DEPLOY == 'yes' + # if: needs.build.outputs.SHOULD_DEPLOY == 'yes' + if: false steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 120061c..8464f9c 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -226,7 +226,6 @@ jobs: - build runs-on: ubuntu-latest env: - APP_NAME: codium RELEASE_VERSION: ${{ needs.build.outputs.RELEASE_VERSION }} strategy: fail-fast: false @@ -234,7 +233,8 @@ jobs: platform: - amd64 - arm64 - if: needs.build.outputs.SHOULD_DEPLOY == 'yes' + # if: needs.build.outputs.SHOULD_DEPLOY == 'yes' + if: false steps: - uses: actions/checkout@v3 @@ -248,18 +248,32 @@ jobs: - uses: docker/setup-qemu-action@v3 if: env.SHOULD_DEPLOY == 'yes' + - name: Prepare snapcraft.yaml + env: + ARCHITECTURE: ${{ matrix.platform }} + run: ./stores/snapcraft/build.sh + if: env.SHOULD_BUILD == 'yes' + - uses: diddlesnaps/snapcraft-multiarch-action@v1 with: path: stores/snapcraft/stable architecture: ${{ matrix.platform }} id: build - if: env.SHOULD_DEPLOY == 'yes' + if: env.SHOULD_BUILD == 'yes' - uses: diddlesnaps/snapcraft-review-action@v1 with: snap: ${{ steps.build.outputs.snap }} isClassic: 'true' - if: env.SHOULD_DEPLOY == 'yes' + if: env.SHOULD_BUILD == 'yes' + + - uses: svenstaro/upload-release-action@v2 + with: + repo_name: ${{ env.ASSETS_REPOSITORY }} + repo_token: ${{ secrets.STRONGER_GITHUB_TOKEN }} + file: ${{ steps.build.outputs.snap }} + tag: ${{ env.RELEASE_VERSION }} + if: env.SHOULD_DEPLOY_TO_RELEASE == 'yes' - uses: snapcore/action-publish@master env: @@ -267,7 +281,7 @@ jobs: with: snap: ${{ steps.build.outputs.snap }} release: stable - if: env.SHOULD_DEPLOY == 'yes' + if: env.SHOULD_DEPLOY_TO_STORE == 'yes' deb-rpm-repo-hook: needs: diff --git a/stores/snapcraft/build.sh b/stores/snapcraft/build.sh index a8db7bb..44cbe1e 100755 --- a/stores/snapcraft/build.sh +++ b/stores/snapcraft/build.sh @@ -65,12 +65,6 @@ cd build if [[ "${CI_BUILD}" == "no" ]]; then snapcraft --use-lxd --debug -# else -# snapcraft - -# SNAP_ARCHIVE=$( ls *.snap ) - -# echo "snap=$( pwd )/${SNAP_ARCHIVE}" >> "$GITHUB_OUTPUT" fi cd "${CALLER_DIR}" diff --git a/stores/snapcraft/check_version.sh b/stores/snapcraft/check_version.sh index d327b67..37dcbc2 100755 --- a/stores/snapcraft/check_version.sh +++ b/stores/snapcraft/check_version.sh @@ -6,15 +6,15 @@ export SHOULD_BUILD="no" export SHOULD_DEPLOY_TO_RELEASE="no" export SHOULD_DEPLOY_TO_STORE="no" -if [[ "${VSCODE_QUALITY}" == "insider" ]]; then - wget --quiet "https://api.github.com/repos/${ASSETS_REPOSITORY}/releases" -O gh_latest.json - SNAP_URL=$( jq -r 'map(select(.tag_name == "'"${RELEASE_VERSION}"'"))|first.assets[].browser_download_url|select(endswith("'"_${ARCHITECTURE}.snap"'"))' gh_latest.json ) +wget --quiet "https://api.github.com/repos/${ASSETS_REPOSITORY}/releases" -O gh_latest.json +SNAP_URL=$( jq -r 'map(select(.tag_name == "'"${RELEASE_VERSION}"'"))|first.assets[].browser_download_url|select(endswith("'"_${ARCHITECTURE}.snap"'"))' gh_latest.json ) - if [[ -z "${SNAP_URL}" ]]; then - export SHOULD_BUILD="yes" - export SHOULD_DEPLOY_TO_RELEASE="yes" - fi -else +if [[ -z "${SNAP_URL}" ]]; then + export SHOULD_BUILD="yes" + export SHOULD_DEPLOY_TO_RELEASE="yes" +fi + +if [[ "${VSCODE_QUALITY}" == "stable" ]]; then sudo snap install --channel stable --classic snapcraft echo "Architecture: ${ARCHITECTURE}"