diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index be82c07e511..c1dc0b55bef 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -45,6 +45,8 @@ jobs: RELEASE_VERSION: ${{ env.RELEASE_VERSION }} SHOULD_BUILD: ${{ env.SHOULD_BUILD }} SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }} + PATCH_REBUILD: ${{ env.PATCH_REBUILD }} + CUSTOM_RELEASE_VERSION: ${{ env.CUSTOM_RELEASE_VERSION }} steps: - uses: actions/checkout@v4 @@ -189,6 +191,8 @@ jobs: RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }} SHOULD_BUILD: ${{ (needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true') && 'yes' || 'no' }} SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }} + PATCH_REBUILD: ${{ needs.check.outputs.PATCH_REBUILD }} + CUSTOM_RELEASE_VERSION: ${{ needs.check.outputs.CUSTOM_RELEASE_VERSION }} VSCODE_ARCH: ${{ matrix.vscode_arch }} ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true outputs: diff --git a/.github/workflows/stable-windows.yml b/.github/workflows/stable-windows.yml index 410e2c76090..41d549a004b 100644 --- a/.github/workflows/stable-windows.yml +++ b/.github/workflows/stable-windows.yml @@ -43,6 +43,8 @@ jobs: RELEASE_VERSION: ${{ env.RELEASE_VERSION }} SHOULD_BUILD: ${{ env.SHOULD_BUILD }} SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }} + PATCH_REBUILD: ${{ env.PATCH_REBUILD }} + CUSTOM_RELEASE_VERSION: ${{ env.CUSTOM_RELEASE_VERSION }} steps: - uses: actions/checkout@v4 @@ -164,6 +166,8 @@ jobs: RELEASE_VERSION: ${{ needs.check.outputs.RELEASE_VERSION }} SHOULD_BUILD: ${{ (needs.check.outputs.SHOULD_BUILD == 'yes' || github.event.inputs.generate_assets == 'true') && 'yes' || 'no' }} SHOULD_DEPLOY: ${{ needs.check.outputs.SHOULD_DEPLOY }} + PATCH_REBUILD: ${{ needs.check.outputs.PATCH_REBUILD }} + CUSTOM_RELEASE_VERSION: ${{ needs.check.outputs.CUSTOM_RELEASE_VERSION }} VSCODE_ARCH: ${{ matrix.vscode_arch }} outputs: RELEASE_VERSION: ${{ env.RELEASE_VERSION }} diff --git a/check_tags.sh b/check_tags.sh index 6973d21591b..7284d8eba22 100755 --- a/check_tags.sh +++ b/check_tags.sh @@ -258,14 +258,14 @@ elif [[ "${ASSETS}" != "null" ]]; then # linux-arm64 if [[ "${VSCODE_ARCH}" == "arm64" || "${CHECK_ALL}" == "yes" ]]; then - if [[ -z $( contains "arm64.deb" ) ]]; then + if [[ -z $( contains "${RELEASE_VERSION}_arm64.deb" ) ]]; then echo "Building on Linux arm64 because we have no DEB" export SHOULD_BUILD="yes" else export SHOULD_BUILD_DEB="no" fi - if [[ -z $( contains "aarch64.rpm" ) ]]; then + if [[ -z $( contains "${RELEASE_VERSION}-el8.aarch64.rpm" ) ]]; then echo "Building on Linux arm64 because we have no RPM" export SHOULD_BUILD="yes" else @@ -317,14 +317,14 @@ elif [[ "${ASSETS}" != "null" ]]; then # linux-armhf if [[ "${VSCODE_ARCH}" == "armhf" || "${CHECK_ALL}" == "yes" ]]; then - if [[ -z $( contains "armhf.deb" ) ]]; then + if [[ -z $( contains "${RELEASE_VERSION}_armhf.deb" ) ]]; then echo "Building on Linux arm because we have no DEB" export SHOULD_BUILD="yes" else export SHOULD_BUILD_DEB="no" fi - if [[ -z $( contains "armv7hl.rpm" ) ]]; then + if [[ -z $( contains "${RELEASE_VERSION}-el8.armv7hl.rpm" ) ]]; then echo "Building on Linux arm because we have no RPM" export SHOULD_BUILD="yes" else @@ -500,14 +500,14 @@ elif [[ "${ASSETS}" != "null" ]]; then # linux-x64 if [[ "${VSCODE_ARCH}" == "x64" || "${CHECK_ALL}" == "yes" ]]; then - if [[ -z $( contains "amd64.deb" ) ]]; then + if [[ -z $( contains "${RELEASE_VERSION}_amd64.deb" ) ]]; then echo "Building on Linux x64 because we have no DEB" export SHOULD_BUILD="yes" else export SHOULD_BUILD_DEB="no" fi - if [[ -z $( contains "x86_64.rpm" ) ]]; then + if [[ -z $( contains "${RELEASE_VERSION}-el8.x86_64.rpm" ) ]]; then echo "Building on Linux x64 because we have no RPM" export SHOULD_BUILD="yes" else @@ -523,7 +523,7 @@ elif [[ "${ASSETS}" != "null" ]]; then if [[ "${DISABLE_APPIMAGE}" == "yes" ]]; then export SHOULD_BUILD_APPIMAGE="no" - elif [[ -z $( contains "x86_64.AppImage" ) ]]; then + elif [[ -z $( contains "${RELEASE_VERSION}.glibc" ) ]]; then echo "Building on Linux x64 because we have no AppImage" export SHOULD_BUILD="yes" else