diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml index 8df9ea2..d61db43 100644 --- a/.github/workflows/insider-linux.yml +++ b/.github/workflows/insider-linux.yml @@ -438,21 +438,21 @@ jobs: uses: actions/download-artifact@v4 with: name: vscode - if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' + if: github.event.inputs.generate_assets == 'true' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') - name: Build env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} npm_config_arch: ${{ matrix.npm_arch }} run: ./package_alpine_reh.sh - if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' + if: github.event.inputs.generate_assets == 'true' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') - name: Release env: GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} GITHUB_USERNAME: ${{ github.repository_owner }} run: ./release.sh - if: env.SHOULD_BUILD_REH != 'no' && env.SHOULD_DEPLOY == 'yes' + if: env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') - name: Upload assets uses: actions/upload-artifact@v4 diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml index 6577923..c48b4a6 100644 --- a/.github/workflows/stable-linux.yml +++ b/.github/workflows/stable-linux.yml @@ -437,21 +437,21 @@ jobs: uses: actions/download-artifact@v4 with: name: vscode - if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' + if: github.event.inputs.generate_assets == 'true' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') - name: Build env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} npm_config_arch: ${{ matrix.npm_arch }} run: ./package_alpine_reh.sh - if: env.SHOULD_BUILD_REH != 'no' || github.event.inputs.generate_assets == 'true' + if: github.event.inputs.generate_assets == 'true' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') - name: Release env: GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }} GITHUB_USERNAME: ${{ github.repository_owner }} run: ./release.sh - if: env.SHOULD_BUILD_REH != 'no' && env.SHOULD_DEPLOY == 'yes' + if: env.SHOULD_DEPLOY == 'yes' && (env.SHOULD_BUILD_REH != 'no' || env.SHOULD_BUILD_REH_WEB != 'no') - name: Upload assets uses: actions/upload-artifact@v4 diff --git a/check_tags.sh b/check_tags.sh index 16f98c6..e10abbc 100755 --- a/check_tags.sh +++ b/check_tags.sh @@ -382,14 +382,14 @@ elif [[ "${ASSETS}" != "null" ]]; then fi - if [[ -z $( contains "${APP_NAME_LC}-reh-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then echo "Building on Linux PowerPC64LE because we have no REH archive" export SHOULD_BUILD="yes" else export SHOULD_BUILD_REH="no" fi - if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-ppc64le-${RELEASE_VERSION}.tar.gz" ) ]]; then echo "Building on Linux PowerPC64LE because we have no REH-web archive" export SHOULD_BUILD="yes" else @@ -414,14 +414,14 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_TAR="no" fi - if [[ -z $( contains "${APP_NAME_LC}-reh-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then echo "Building on Linux RISC-V 64 because we have no REH archive" export SHOULD_BUILD="yes" else export SHOULD_BUILD_REH="no" fi - if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-riscv64-${RELEASE_VERSION}.tar.gz" ) ]]; then echo "Building on Linux RISC-V 64 because we have no REH-web archive" export SHOULD_BUILD="yes" else @@ -446,14 +446,14 @@ elif [[ "${ASSETS}" != "null" ]]; then export SHOULD_BUILD_TAR="no" fi - if [[ -z $( contains "${APP_NAME_LC}-reh-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then echo "Building on Linux Loong64 because we have no REH archive" export SHOULD_BUILD="yes" else export SHOULD_BUILD_REH="no" fi - if [[ -z $( contains "${APP_NAME_LC}-reh-web-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then + if [[ "${CHECK_REH}" != "no" && -z $( contains "${APP_NAME_LC}-reh-web-linux-loong64-${RELEASE_VERSION}.tar.gz" ) ]]; then echo "Building on Linux Loong64 because we have no REH-web archive" export SHOULD_BUILD="yes" else