diff --git a/.github/workflows/common_build.yml b/.github/workflows/common_build.yml index 9a80c5763d..358bf1c0dd 100644 --- a/.github/workflows/common_build.yml +++ b/.github/workflows/common_build.yml @@ -123,6 +123,7 @@ jobs: gcc_version: 13 trik_qt_version: 5.15 trik_python3_version_minor: 3.11 + linux_installer_environment: true build-ubuntu-debug-tests: needs: lint @@ -148,4 +149,5 @@ jobs: gcc_version: 13 trik_qt_version: 5.15 trik_python3_version_minor: 3.11 + linux_installer_environment: true secrets: inherit diff --git a/.github/workflows/setup_environment.yml b/.github/workflows/setup_environment.yml index 50ed3f1735..5c1a21b137 100644 --- a/.github/workflows/setup_environment.yml +++ b/.github/workflows/setup_environment.yml @@ -108,13 +108,14 @@ jobs: TRIK_QT_VERSION: ${{ inputs.trik_qt_version }} TRIK_PYTHON3_VERSION_MINOR: ${{ inputs.trik_python3_version_minor }} GCC_VERSION: ${{ inputs.gcc_version }} - if: ${{ linux_installer_environment == "true"}} + BUILD_INSTALLER: ${{ inputs.build_installer }} + if: ${{ inputs.linux_installer_environment == true}} - name: Lint run: | sudo apt-get update && sudo apt-get install -y --no-install-recommends qttools5-dev-tools qtbase5-dev vera++ ${{ inputs.executor }} buildScripts/github/vera_translation.sh - if: ${{ inputs.lint == 'true' }} + if: ${{ inputs.lint == true }} - name: Restore cache uses: actions/cache@v4 @@ -125,7 +126,7 @@ jobs: ccache-c${{ inputs.container_name }}-${{ inputs.os }}-${{ inputs.config }}-${{ inputs.qmake_extra }} ccache-c${{ inputs.container_name }}-${{ inputs.os }}-${{ inputs.config }} ccache-c${{ inputs.container_name }}-${{ inputs.os }} - if: ${{ inputs.build == 'true' }} + if: ${{ inputs.build == true }} - name: Build run: buildScripts/github/build.sh @@ -138,7 +139,7 @@ jobs: CONFIG: ${{ inputs.config }} EXECUTOR: ${{ inputs.executor }} QMAKE_EXTRA: ${{ inputs.qmake_extra }} - if: ${{ inputs.build == 'true' }} + if: ${{ inputs.build == true }} - name: Save build cache uses: actions/cache/save@v4 @@ -152,7 +153,7 @@ jobs: env: TRIK_PYTHON3_VERSION_MINOR: ${{ inputs.trik_python3_version_minor }} TESTS: ${{ inputs.tests }} - if: ${{ inputs.build == 'true' }} + if: ${{ inputs.build == true }} - name: Build Installer run: | @@ -169,7 +170,7 @@ jobs: ssh_key: ${{ secrets.DL_PRIVATE_SSH_KEY }} username: ${{ secrets.DL_USERNAME }} host: ${{ secrets.DL_HOST }} - if: ${{ inputs.build_installer == 'true' }} + if: ${{ inputs.build_installer == true }} - name: Eval artifact name run: | @@ -185,4 +186,4 @@ jobs: installer/*.exe installer/*.run installer/*.dmg - if: ${{ inputs.build_installer == 'true' }} + if: ${{ inputs.build_installer == true }} diff --git a/buildScripts/github/build_installer.sh b/buildScripts/github/build_installer.sh index dfe22fbf79..6b359fea98 100755 --- a/buildScripts/github/build_installer.sh +++ b/buildScripts/github/build_installer.sh @@ -8,7 +8,7 @@ case $RUNNER_OS in TSNAME="trik-studio-installer-mac-$BRANCH_NAME.dmg" ;; Linux) - QTIFWBIN=$(find $PWD/Qt/Tools -name "bin" | head -n 1) + QTIFWBIN=$(find /Qt/Tools -name "bin" | head -n 1) ID=$(grep '^ID=' /etc/os-release | cut -d'=' -f2) TSNAME="trik-studio-installer-linux-$BRANCH_NAME-$ID.run" ;;