Merge master into junior (#1633)

* Bump thirdparty/gamepad/gamepad from `5f9ead9` to `d7870ad` Bumps [thirdparty/gamepad/gamepad](https://github.com/trikset/trik-desktop-gamepad) from `5f9ead9` to `d7870ad`. - [Release notes](https://github.com/trikset/trik-desktop-gamepad/releases) - [Commits](trikset/trik-desktop-gamepad@5f9ead9...d7870ad) --- updated-dependencies: - dependency-name: thirdparty/gamepad/gamepad dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Bump plugins/robots/thirdparty/hidapi from `4ab60e0` to `b66d7c2` (#1481) Bumps [plugins/robots/thirdparty/hidapi](https://github.com/libusb/hidapi) from `4ab60e0` to `b66d7c2`. - [Release notes](https://github.com/libusb/hidapi/releases) - [Commits](libusb/hidapi@4ab60e0...b66d7c2) --- updated-dependencies: - dependency-name: plugins/robots/thirdparty/hidapi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Add 'any' for all objects of inside tag * Lupdate * Fix crash when mailbox is not enabled (#1486) * Bump plugins/robots/thirdparty/hidapi from `b66d7c2` to `d67b5c9` Bumps [plugins/robots/thirdparty/hidapi](https://github.com/libusb/hidapi) from `b66d7c2` to `d67b5c9`. - [Release notes](https://github.com/libusb/hidapi/releases) - [Commits](libusb/hidapi@b66d7c2...d67b5c9) --- updated-dependencies: - dependency-name: plugins/robots/thirdparty/hidapi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> * Bump thirdparty/checkapp/checkapp from `35e4399` to `80ab06e` (#1493) Bumps [thirdparty/checkapp/checkapp](https://github.com/trikset/trik-checkapp) from `35e4399` to `80ab06e`. - [Release notes](https://github.com/trikset/trik-checkapp/releases) - [Commits](trikset/trik-checkapp@35e4399...80ab06e) --- updated-dependencies: - dependency-name: thirdparty/checkapp/checkapp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump qrtest/thirdparty/googletest/googletest from `bf0701d` to `97a4675` (#1494) Bumps [qrtest/thirdparty/googletest/googletest](https://github.com/google/googletest) from `bf0701d` to `97a4675`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](google/googletest@bf0701d...97a4675) --- updated-dependencies: - dependency-name: qrtest/thirdparty/googletest/googletest dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Lidar (#1434) * Add lidar reading * Add lidar as sensor * Simulate lidar * Add lidar emulation for trikbrick * Fixes after review * No need to reread sensor * Polish lidar working * Add Read Lidar Block * Add Read Lidar block to palette * Add generator for Read Lidar block * Disable Read Lidar Block * Need to draw image with real display width and hight * Lupdate * Fix build * Make Vera happy * Update Runtime * Make Vera happy * Fix Python.zip problem (#1497) * Add lidar example (#1496) * Bump thirdparty/checkapp/checkapp from `80ab06e` to `3df13d6` (#1504) Bumps [thirdparty/checkapp/checkapp](https://github.com/trikset/trik-checkapp) from `80ab06e` to `3df13d6`. - [Release notes](https://github.com/trikset/trik-checkapp/releases) - [Commits](trikset/trik-checkapp@80ab06e...3df13d6) --- updated-dependencies: - dependency-name: thirdparty/checkapp/checkapp dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump plugins/robots/thirdparty/hidapi from `d67b5c9` to `af6c601` (#1502) Bumps [plugins/robots/thirdparty/hidapi](https://github.com/libusb/hidapi) from `d67b5c9` to `af6c601`. - [Release notes](https://github.com/libusb/hidapi/releases) - [Commits](libusb/hidapi@d67b5c9...af6c601) --- updated-dependencies: - dependency-name: plugins/robots/thirdparty/hidapi dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * GHA CI: Shift to Qt 5.12.12 * CI: Fix tagged Windows build with multiple tags * Pioneer (#1506) * Add setting for pioneer * Add simple pioneer's blocks * Fix build * Change uploading logic * Add switch block generation * Add 'GPIO Init' block * Add 'Set GPIO state' block * Add 'Read GPIO' block * Add pioneer additional settings on settings page * Use QT IFW 4.3 * Add images * Add descriptions and translations * Spilt save file format (#1525) * First step to split save info * Fix patcher with images (#1536) * Set/move robot start position from the context menu (#1505) * Fix text for read-only flags * Add button to set robot start position under current robot pos * Fix read-only sensors behavior * Use QT IFW 4.3 * Delete vanished translations * Clean the code * Remove `strict` from mergify.io config `Strict` is obsolete now * Fix patcher with blobs (#1538) * No need to autoconfigure mototrs (#1540) * Save format (#1537) * Split serialize for worldModel and robotModel * Split desirialize for worldModel and robotModel and fix some old bugs * Remove annoying warning * Update version number * Change version to 2022.2 * Add version conversion to console mode too * Add messages from project manager to console * No need encoders auto-configuration (#1547) * No need encoders auto-configuration * Lupdate * Drop cursor on ESC (#1553) * Drop cursor on ESC * Fix build and add message for updating QT IFW * Checker (#1552) * Add message trigger to checker * Open 2d model even with errors * Add interpretation errored * Add comment item to 2D (#1541) * Add text to comment item * Add drawComment cursor * Add pallete icon for comment item * Add comment item in world model deserialize * Fix build and add message for updating QT IFW * Drop cursor on ESC * Add checker runtime with bionic base * Ignore false memleak * Force Qt5.12 and QtIfw 4.2.0 Switch Azure build to macOS-11 hosts, macOS-10.15 is deprecated GHA: install proper version of QtIfw macOS: use Qt5.12 and QtIfw 4.2.0 [trik-runtime] update * Fix macOS installer build Fix macOS tests macOS set Python version outside' * Add correct TRIK_PYTHONPATH for tests * .gitignore pyinstaller artifacts * Add QtSerialPort to installer * Mass fix missing quotes in scripts * Use rsync instead of cp * Fix rcc and moc calls * Fix gcc-10 build * Initial docker image to build for ALT linux * Fix mingw path for rsync * Add DPI logging And related settings * Fix opening some saves (#1566) * Enable Asan for integration tests * Add default values for installer script * submodules update * Fix Linux build: ignore git warnings * Fix Linux build: ignore git warnings * Set global git option to ignore directory owner * Fix translations * Hotfix for 2022.2 linux build (#1580) * Set global git option to ignore directory owner * Fix translations * Fix problem with current configuration (#1581) * Use QextSerialPort as submodule * Lupdate * Update submodules * Introduce CONFIG+=use_system_quazip but quazip mostly lacks pkg-config support in main distros * Support CONFIG+=use_system_quazip + Python 3.10 compatibility * Fix memleak in dock window * Purge obsolete garbage * Load qt5 translations (#1594) Load qt5 translations for modules * Remove falty pkg-config --list-all (#1599) * Remove falty `pkg-config --list-all`, that causes crash at the moment on macOS build host * Sloppy ccache for Azure * Remove pessimising move * Azure: add caching on build timeout, but skip full build (UNFINISHED) * Azure: split build scripts * Set startup language to system if not set from config (#1598) * Support startup with system locale * Enable early logging to console * Code cleanup * Fix NPE But this crash is caused by some architecture issue... * Add variables to checker messages (#1602) * Add variables in messages from checker ```xml <triggers> <success/> <message text="We have finished! Score: %myvar%" > <replace var="myvar"> <sum>  <variableValue name="total_score"/> <int value="2"/> </sum> </replace> </message> </triggers> </event> ``` Co-authored-by: IKhonakhbeeva <i.khonakhbeeva@gmail.com> * Add log trigger (#1603) * Add log trigger * Lupdate * Installer script: support both QtIFw 3.x and 4.x * 2D-model: add option --close to close window on exit * Add onSuccess event (#1604) * Add onSuccess event * Add true condition * Allow multiple on_success handlers * Use script instead of sshpass on Windows * Fix lost robot's position for loadWorldModel action (#1622) * Fix lost robot's position for loadWorldModel action * Fix deploy Co-authored-by: iakov <iakov@users.noreply.github.com> * Fix sin/cos and small values display (#1631) * Fix printing very small values for printTextBlock * Use degrees for sin and cos in block's programming instead of radians * Fix sin/cos generation for python and js on trik * Fix printTextBlock for trik too --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: iakov <iakov@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: Andrei Khodko <andrei.khodko@gmail.com> Co-authored-by: Iakov 'Jake' Kirilenko <jake.kirilenko@gmail.com> Co-authored-by: Vladimir Kutuev <vladimir.kutuev@gmail.com> Co-authored-by: Iakov Kirilenko <iakov@trikset.com>
trikset · Mar 1, 2023 · d9fb102 · d9fb102
1 parent d6bf365
commit d9fb102
Show file tree

Hide file tree

Showing 509 changed files with 19,133 additions and 21,958 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,7 +37,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - qt-version: '5.12.11'
+          - qt-version: '5.12.12'
             mingw-version: 7.3
             mingw-short-version: 73
             python-version: 3.8
@@ -69,14 +69,7 @@ jobs:
         run: |
             ARCH=32
             PLATFORM=i686
-            pacman --verbose --noconfirm -S msys/zlib-devel dos2unix ccache rsync unzip sshpass mingw$ARCH/mingw-w64-$PLATFORM-libzip mingw$ARCH/mingw-w64-$PLATFORM-libusb mingw$ARCH/mingw-w64-$PLATFORM-zlib mingw$ARCH/mingw-w64-$PLATFORM-pkg-config
-
-# https://github.com/msys2/MSYS2-packages/issues/2485 - sshpass failed with strange error
-      - name: Get older sshpass
-        run: |
-            wget http://repo.msys2.org/msys/x86_64/sshpass-1.06-1-x86_64.pkg.tar.xz
-            pacman --verbose --noconfirm -U ./sshpass-1.06-1-x86_64.pkg.tar.xz
-            rm ./sshpass-1.06-1-x86_64.pkg.tar.xz
+            pacman --verbose --noconfirm -S msys/zlib-devel dos2unix ccache rsync unzip openssh mingw$ARCH/mingw-w64-$PLATFORM-libzip mingw$ARCH/mingw-w64-$PLATFORM-libusb mingw$ARCH/mingw-w64-$PLATFORM-zlib mingw$ARCH/mingw-w64-$PLATFORM-pkg-config
 
       - name: Inject slug/short variables
         uses: rlespinasse/github-slug-action@v3.x
@@ -103,9 +96,25 @@ jobs:
           version: ${{matrix.qt-version}}
           arch: win32_mingw${{matrix.mingw-short-version}}
           modules: 'qtscript'
-          tools: 'tools_ifw,4.2.0-0-202111080926,qt.tools.ifw.42 tools_mingw,${{matrix.mingw-version}}.0,qt.tools.win32_mingw${{matrix.mingw-short-version}}0'
+          tools: 'tools_mingw,${{matrix.mingw-version}}.0,qt.tools.win32_mingw${{matrix.mingw-short-version}}0'
           extra: '--external 7z'
 
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Install proper version for QtIfw
+        run: |
+             cd "$RUNNER_TEMP"
+             curl -Lo qtifw.exe "https://download.qt.io/official_releases/qt-installer-framework/4.2.0/QtInstallerFramework-windows-x86-4.2.0.exe"
+             export TRIK_QT_INSTALL_DIR="${IQTA_TOOLS}/QtInstallerFramework/4.2.0"
+             mkdir -p $TRIK_QT_INSTALL_DIR
+             "$RUNNER_TEMP"/qtifw.exe --verbose --no-force-installations --show-virtual-components --script "${GITHUB_WORKSPACE}\\plugins\\robots\\thirdparty\\trikRuntime\\trikRuntime\\docker\\qt_scriptinstall.qs"
+             rm -rf "$TRIK_QT_INSTALL_DIR"/{doc,examples,Uninstaller.app,Uninstaller.dat}
+
+
 # After Qt install action, that spoils pythonLocation variable
       - name: Set up Python ${{matrix.python-version}}
         uses: actions/setup-python@v2
@@ -123,12 +132,6 @@ jobs:
       - name: Check PATH
         run: echo PATH="$PATH"
 
-      - name: Checkout repository
-        uses: actions/checkout@v2
-        with:
-          submodules: recursive
-          fetch-depth: 0
-
       - name: Check available tools
         run: |
              set -xueo pipefail
@@ -197,7 +200,7 @@ jobs:
       - name: Build installer
         run: |
             cd $GITHUB_WORKSPACE/installer
-            ./build-trik-studio.sh "${Qt5_Dir}/bin" "${IQTA_TOOLS}/QtInstallerFramework/4.2/bin" "${{ env.BUILD_DIR }}"
+            ./build-trik-studio.sh "${Qt5_Dir}/bin" "${IQTA_TOOLS}/QtInstallerFramework/4.2.0/bin" "${{ env.BUILD_DIR }}"
 
       - name: Push installer
         uses: actions/upload-artifact@v2
@@ -215,14 +218,17 @@ jobs:
             exit 1
 
       - name: Get tag
-        run: echo "CURRENT_TAG=$(git tag --contains HEAD)" >> $GITHUB_ENV
+        run: echo "CURRENT_TAG=$(git tag --contains HEAD | sort -Vr | head -n1)" >> $GITHUB_ENV
       - name: Check tag
         if: ${{ env.CURRENT_TAG != ''}}
         run: echo "GITHUB_REF_SLUG=${{ env.CURRENT_TAG }}" >> $GITHUB_ENV
 
       - name: Deploy installer
         if: ${{ matrix.deploy-installer && github.event_name != 'pull_request' && github.repository_owner == 'trikset' }}
-        run: sshpass -p ${{ secrets.DL_PASSWORD }} rsync -ve "ssh -o StrictHostKeyChecking=no" installer/trik-studio*installer*.exe ${{ secrets.DL_USERNAME }}@${{ secrets.DL_HOST }}:~/dl/ts/fresh/installer/trik-studio-${{ env.GITHUB_REF_SLUG }}-i686-installer.exe
+        run: |
+            install -m 600 -D /dev/null ~/.ssh/id_rsa
+            echo "${{ secrets.DL_PRIVATE_SSH_KEY }}" > ~/.ssh/id_rsa
+            rsync -v --rsh="ssh -o StrictHostKeyChecking=no" installer/trik-studio*installer*.exe ${{ secrets.DL_USERNAME }}@${{ secrets.DL_HOST }}:~/dl/ts/fresh/installer/trik-studio-${{ env.GITHUB_REF_SLUG }}-i686-installer.exe
 
       - name: Prepare for RDP connection
         if: false #comment this line to create RDP session

diff --git a/.gitmodules b/.gitmodules
@@ -19,3 +19,6 @@
 [submodule "trik-checkapp"]
 	path = thirdparty/checkapp/checkapp
 	url = https://github.com/trikset/trik-checkapp
+[submodule "plugins/robots/thirdparty/qextserialport/qextserialport"]
+	path = plugins/robots/thirdparty/qextserialport/qextserialport
+	url = https://github.com/qextserialport/qextserialport
diff --git a/.mergify.yml b/.mergify.yml
@@ -14,4 +14,3 @@ pull_request_rules:
     actions:
       merge:
         method: squash
-        strict: smart  # less CI build time when a lot of PRs
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -13,7 +13,9 @@ variables:
   EXECUTOR: "time docker exec -i builder"
   PROJECT: studio
   TESTS: true
-  BUILD_TIMEOUT: 2800
+  TRIK_PYTHON3_VERSION_MINOR: 9
+  TRIK_QT_VERSION: 5.12
+  BUILD_TIMEOUT: 2400
   CCACHE_CONFIGPATH: "$(Pipeline.Workspace)/ccache.conf"
   CCACHE_DIR: "$(Pipeline.Workspace)/.ccache/$(Agent.OS)-$(CONFIG)"
 
@@ -57,15 +59,15 @@ parameters:
     type: step
     default:
       bash: |
-        buildScripts/azure/buildNoTests.sh & WPID=$!
-        sleep $BUILD_TIMEOUT && { kill $WPID || true ; echo "***KILLED ON TIMEOUT***" ; } & KPID=$!
-        wait $WPID ; RES=$?; kill -0 $KPID && kill $KPID > /dev/null || true ;
-      displayName: 'Build with buildNoTests.sh'
+        buildScripts/azure/build.sh & WPID=$!
+        sleep $BUILD_TIMEOUT && {  echo -e "\033[31;1;7m***KILLED ON TIMEOUT***\033[0m" ; echo "##vso[task.setvariable variable=isTimeout;isOutput=true]Yes" ; pkill -TERM -P $WPID ; } & KPID=$!
+        wait $WPID ; kill $KPID > /dev/null || true
+      displayName: 'Build without tests'
 
   - name: buildWithTestsStep
     type: step
     default:
-      bash: buildScripts/azure/buildWithTests.sh
+      bash: buildScripts/azure/build.sh
       displayName: 'Build with buildWithTests.sh'
 
   - name: buildInstallerStep
@@ -115,10 +117,10 @@ stages:
   - job: Build
     strategy:
       matrix:
-        Linux release:
+        LinuxRelease:
           imageName: 'ubuntu-latest'
           QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
-        Linux debug:
+        LinuxDebug:
           imageName: 'ubuntu-latest'
           QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=silent CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
           CONFIG: debug
@@ -139,12 +141,12 @@ stages:
   - job: Build
     strategy:
       matrix:
-        MacOS release:
-          imageName: 'macOS-10.15'
+        macOSRelease:
+          imageName: 'macOS-11'
           QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
           EXECUTOR: "time"
-        MacOS debug:
-          imageName: 'macOS-10.15'
+        macOSDebug:
+          imageName: 'macOS-11'
           QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=silent CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
           CONFIG: debug
           EXECUTOR: "time"
@@ -160,7 +162,7 @@ stages:
 - stage: linuxBuildWithTestsStage
   displayName: Linux build with tests
   dependsOn: linuxCacheableBuildStage
-  condition: succeeded()
+  condition: and(succeeded(),and(ne(stageDependencies.linuxCacheableBuildStage.Build.outputs['LinuxRelease.BuildNoTestsStep.isTimeout'],'Yes'),ne(stageDependencies.linuxCacheableBuildStage.Build.outputs['LinuxDebug.BuildNoTestsStep.isTimeout'],'Yes')))
   jobs:
   - job: Build
     strategy:
@@ -187,17 +189,17 @@ stages:
 - stage: macOSBuildWithTestsStage
   displayName: MacOs build with tests
   dependsOn: macOSCacheableBuildStage
-  condition: succeeded()
+  condition: and(succeeded(),and(ne(stageDependencies.macOSCacheableBuildStage.Build.outputs['macOSRelease.BuildNoTestsStep.isTimeout'],'Yes'),ne(stageDependencies.macOSCacheableBuildStage.Build.outputs['macOSDebug.BuildNoTestsStep.isTimeout'],'Yes')))
   jobs:
   - job: Build
     strategy:
       matrix:
         MacOS release + tests:
-          imageName: 'macOS-10.15'
+          imageName: 'macOS-11'
           QMAKE_EXTRA: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
           EXECUTOR: "time"
         macOS debug + tests:
-          imageName: 'macOS-10.15'
+          imageName: 'macOS-11'
           QMAKE_EXTRA: "CONFIG+=tests CONFIG+=noPch CONFIG+=ccache CONFIG+=silent CONFIG+=small_debug_info CONFIG+=sanitizer CONFIG+=sanitize_undefined CONFIG+=sanitize_address"
           CONFIG: debug
           EXECUTOR: "time"
@@ -242,7 +244,7 @@ stages:
       QMAKE_EXTRA: "CONFIG+=noPch CONFIG+=ccache CONFIG+=no-sanitizers CONFIG+=silent CONFIG+=warn_off"
       EXECUTOR: "time"
     pool:
-      vmImage: 'macOS-10.15'
+      vmImage: 'macOS-11'
 
     steps:
     - ${{ parameters.checkoutStep }}

diff --git a/buildScripts/azure/build.sh b/buildScripts/azure/build.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+set -uxeo pipefail
+
+CODECOV=true
+case $AGENT_OS in
+  Darwin)
+     QT_DIR=$(ls -dv "$HOME"/Qt/${TRIK_QT_VERSION}*/*/bin | head -n 1)
+     [ -d "$QT_DIR" ] && export PATH="$QT_DIR:$PATH"
+     export PATH="/usr/local/opt/ccache/libexec:$PATH"
+     export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
+     echo "Now path is $PATH"
+    ;;
+  Linux)
+     # if [[ "$TESTS" != "true" ]] ; then CODECOV="$EXECUTOR bash -ic \" python -m codecov \" " ; fi
+   ;;
+  *) exit 1 ;;
+esac
+
+mkdir -p $CCACHE_DIR || sudo chown -R $USER $CCACHE_DIR || :
+cat << EOF > $CCACHE_CONFIGPATH
+compiler_check=content
+run_second_cpp=true
+cache_dir=$CCACHE_DIR
+compression=true
+compression_level=1
+sloppiness=time_macros,pch_defines,include_file_ctime,include_file_mtime,file_stat_matches
+max_size=1200M
+EOF
+
+$EXECUTOR env \
+CCACHE_CONFIGPATH="$CCACHE_CONFIGPATH" \
+CONFIG="$CONFIG" \
+QMAKE_EXTRA="$QMAKE_EXTRA" \
+PROJECT="$PROJECT" \
+AGENT_OS="$AGENT_OS" \
+TESTS="$TESTS" \
+buildScripts/azure/build_internal.sh
+
+
+df -h .
+$EXECUTOR bash -ic buildScripts/azure/checkStatus.sh
+
+$CODECOV
diff --git a/buildScripts/azure/buildNoTests.sh b/buildScripts/azure/buildNoTests.sh
diff --git a/buildScripts/azure/buildWithTests.sh b/buildScripts/azure/buildWithTests.sh
diff --git a/buildScripts/azure/build_installer.sh b/buildScripts/azure/build_installer.sh
@@ -6,7 +6,7 @@ case $AGENT_OS in
   Darwin)
     QTIFWBIN=$HOME/qtifw/bin
     TSNAME=trik-studio-installer-mac-$BRANCH_NAME.dmg
-    export TRIK_PYTHON3_VERSION_MINOR="$(python3 -V | sed 's#^Python [0-9]\.\([0-9]\)\.[0-9]*$#\1#g')"
+#    export TRIK_PYTHON3_VERSION_MINOR="$(python3 -V | sed 's#^Python 3\.\([0-9]+\)\.[0-9]+$#\1#g')"
     ;;
   Linux)
     QTIFWBIN=/opt/qtifw/bin