diff --git a/.github/workflows/insider-windows.yml b/.github/workflows/insider-windows.yml index a92cd13..7fdc327 100644 --- a/.github/workflows/insider-windows.yml +++ b/.github/workflows/insider-windows.yml @@ -83,6 +83,7 @@ jobs: - name: Check existing VSCodium tags/releases env: + DISABLE_MSI: ${{ vars.DISABLE_INSIDER_MSI }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: ./check_tags.sh if: env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true' @@ -103,6 +104,7 @@ jobs: id: upload-unsigned-artifacts uses: actions/upload-artifact@v4 with: + name: unsigned-${{ matrix.vscode_arch }} path: assets/*.exe retention-days: 1 if: env.SHOULD_BUILD == 'yes' && (env.SHOULD_DEPLOY == 'yes' || github.event.inputs.generate_assets == 'true') diff --git a/check_tags.sh b/check_tags.sh index f7eeb76..b738cbe 100755 --- a/check_tags.sh +++ b/check_tags.sh @@ -163,14 +163,18 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_ZIP="no" fi - if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then + if [[ "${DISABLE_MSI}" == "yes" ]]; then + export SHOULD_BUILD_MSI="no" + elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then echo "Building on Windows ia32 because we have no msi" export SHOULD_BUILD="yes" else export SHOULD_BUILD_MSI="no" fi - if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then + if [[ "${DISABLE_MSI}" == "yes" ]]; then + export SHOULD_BUILD_MSI_NOUP="no" + elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then echo "Building on Windows ia32 because we have no updates-disabled msi" export SHOULD_BUILD="yes" else @@ -218,14 +222,18 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_ZIP="no" fi - if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then + if [[ "${DISABLE_MSI}" == "yes" ]]; then + export SHOULD_BUILD_MSI="no" + elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-${RELEASE_VERSION}.msi" ) ]]; then echo "Building on Windows x64 because we have no msi" export SHOULD_BUILD="yes" else export SHOULD_BUILD_MSI="no" fi - if [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then + if [[ "${DISABLE_MSI}" == "yes" ]]; then + export SHOULD_BUILD_MSI_NOUP="no" + elif [[ -z $( contains "${APP_NAME}-${VSCODE_ARCH}-updates-disabled-${RELEASE_VERSION}.msi" ) ]]; then echo "Building on Windows x64 because we have no updates-disabled msi" export SHOULD_BUILD="yes" else @@ -545,6 +553,10 @@ else export SHOULD_BUILD_REH="no" export SHOULD_BUILD_REH_WEB="no" fi + if [[ "${DISABLE_MSI}" == "yes" ]]; then + export SHOULD_BUILD_MSI="no" + export SHOULD_BUILD_MSI_NOUP="no" + fi fi echo "Release assets do not exist at all, continuing build"