diff --git a/.github/workflows/common_build.yml b/.github/workflows/common_build.yml index ccf30706d0..36932e9fa0 100644 --- a/.github/workflows/common_build.yml +++ b/.github/workflows/common_build.yml @@ -140,6 +140,7 @@ jobs: container_name: rockylinux:8 build: true build_installer: true + need_deploy: false qmake_extra: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=sanitizer CONFIG+=sanitize-undefined CONFIG+=sanitize_address" gcc_version: 13 trik_qt_version: 5.15 diff --git a/.github/workflows/setup_environment.yml b/.github/workflows/setup_environment.yml index adb6faffcf..645fbd0e40 100644 --- a/.github/workflows/setup_environment.yml +++ b/.github/workflows/setup_environment.yml @@ -14,6 +14,10 @@ on: required: false type: boolean default: false + need_deploy: + required: false + type: boolean + default: true build: required: true type: boolean @@ -175,6 +179,7 @@ jobs: EXECUTOR: ${{ inputs.executor }} BRANCH_NAME: ${{ github.event.pull_request.head.ref }} PULLREQUESTNUMBER: ${{ github.event.pull_request.number }} + NEED_DEPLOY: ${{ inputs.need_deploy }} ssh_key: ${{ secrets.DL_PRIVATE_SSH_KEY }} username: ${{ secrets.DL_USERNAME }} host: ${{ secrets.DL_HOST }} diff --git a/buildScripts/github/build_installer.sh b/buildScripts/github/build_installer.sh index 026528b3a1..c2d40e6f7e 100755 --- a/buildScripts/github/build_installer.sh +++ b/buildScripts/github/build_installer.sh @@ -17,7 +17,8 @@ case "$RUNNER_OS" in esac df -h . -NEED_DEPLOY=$([[ "$GITHUB_REPOSITORY" == "trikset/trik-studio" && "${PULLREQUESTNUMBER:-false}" == "false" ]] && echo true || echo false ) +IS_ORIGIN_MASTER=$([[ "$GITHUB_REPOSITORY" == "trikset/trik-studio" && "${PULLREQUESTNUMBER:-false}" == "false" ]] && echo true || echo false ) +NEED_DEPLOY=$([[ "$IS_ORIGIN_MASTER" == "true" && "$NEED_DEPLOY" == "true" ]] && echo true || echo false ) if "$NEED_DEPLOY" ; then $EXECUTOR bash -c "mkdir -p $HOME/.ssh && install -m 600 /dev/null $HOME/.ssh/id_rsa && echo \"$ssh_key\" > $HOME/.ssh/id_rsa"