diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index e8a8c77..28c9eea 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -138,7 +138,7 @@ jobs: if: env.SHOULD_BUILD == 'yes' - name: Upload vscode artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: vscode path: ./vscode.tar.gz @@ -182,7 +182,7 @@ jobs: SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ env.GITHUB_BRANCH }} if: env.SHOULD_BUILD == 'yes' @@ -210,7 +210,7 @@ jobs: if: env.SHOULD_BUILD == 'yes' - name: Download vscode artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: vscode if: env.SHOULD_BUILD == 'yes' @@ -245,7 +245,7 @@ jobs: if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' - name: Upload assets - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bin-${{ matrix.vscode_arch }} path: assets/ @@ -291,7 +291,7 @@ jobs: if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ env.GITHUB_BRANCH }} if: env.DISABLED != 'yes' @@ -337,7 +337,7 @@ jobs: if: env.DISABLED != 'yes' - name: Download vscode artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: vscode if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') @@ -389,7 +389,7 @@ jobs: if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ env.GITHUB_BRANCH }} @@ -419,7 +419,7 @@ jobs: if: env.SHOULD_BUILD == 'yes' - name: Download vscode artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: vscode if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' @@ -491,7 +491,7 @@ jobs: if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_INSIDER_SNAP != 'yes' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ env.GITHUB_BRANCH }} diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 92e7186..5924e3c 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -137,7 +137,7 @@ jobs: if: env.SHOULD_BUILD == 'yes' - name: Upload vscode artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: vscode path: ./vscode.tar.gz @@ -181,7 +181,7 @@ jobs: SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ env.GITHUB_BRANCH }} if: env.SHOULD_BUILD == 'yes' @@ -208,7 +208,7 @@ jobs: if: env.SHOULD_BUILD == 'yes' - name: Download vscode artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: vscode if: env.SHOULD_BUILD == 'yes' @@ -243,7 +243,7 @@ jobs: if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes' - name: Upload assets - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: bin-${{ matrix.vscode_arch }} path: assets/ @@ -289,7 +289,7 @@ jobs: if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ env.GITHUB_BRANCH }} if: env.DISABLED != 'yes' @@ -335,7 +335,7 @@ jobs: if: env.DISABLED != 'yes' - name: Download vscode artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: vscode if: env.DISABLED != 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no' || github.event.inputs.generate_assets == 'true') @@ -387,7 +387,7 @@ jobs: if: needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ env.GITHUB_BRANCH }} @@ -417,7 +417,7 @@ jobs: if: env.SHOULD_BUILD == 'yes' - name: Download vscode artifact - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: vscode if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' @@ -455,8 +455,8 @@ jobs: include: - package_name: vscodium package_type: stable - - package_name: vscodium-git - package_type: rolling + # - package_name: vscodium-git + # package_type: rolling if: needs.check.outputs.SHOULD_DEPLOY == 'yes' steps: @@ -486,7 +486,7 @@ jobs: if: needs.check.outputs.SHOULD_DEPLOY == 'yes' && vars.DISABLE_STABLE_SNAP != 'yes' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ env.GITHUB_BRANCH }} @@ -499,6 +499,7 @@ jobs: env: ARCHITECTURE: ${{ matrix.platform }} GENERATE_ASSETS: ${{ github.event.inputs.generate_assets }} + SNAPCRAFT_STORE_CHANNEL: ${{ vars.SNAP_STORE_CHANNEL }} SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }} run: ./stores/snapcraft/check_version.sh diff --git a/package_linux_reh.sh b/package_linux_reh.sh index 9a3e36c..a9f5cbd 100755 --- a/package_linux_reh.sh +++ b/package_linux_reh.sh @@ -154,7 +154,7 @@ if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then pushd "../vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}" if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then - exec "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" + bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" fi echo "Archiving REH" @@ -173,7 +173,7 @@ if [[ "${SHOULD_BUILD_REH_WEB}" != "no" ]]; then pushd "../vscode-reh-web-${VSCODE_PLATFORM}-${VSCODE_ARCH}" if [[ -f "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" ]]; then - exec "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" + bash "../ripgrep_${VSCODE_PLATFORM}_${VSCODE_ARCH}.sh" fi echo "Archiving REH-web" diff --git a/stores/snapcraft/check_version.sh b/stores/snapcraft/check_version.sh index 4585160..51be428 100755 --- a/stores/snapcraft/check_version.sh +++ b/stores/snapcraft/check_version.sh @@ -22,7 +22,9 @@ else fi if [[ "${VSCODE_QUALITY}" == "stable" ]]; then - sudo snap install --channel stable --classic snapcraft + CHANNEL="${SNAPCRAFT_STORE_CHANNEL:-stable}" + + sudo snap install --channel "${CHANNEL}" --classic snapcraft echo "Architecture: ${ARCHITECTURE}"