Update GH actions (#1672)

trikset · Jul 17, 2023 · 2d9562d · 2d9562d
1 parent 02010b1
commit 2d9562d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/centos.yml b/.github/workflows/centos.yml
@@ -95,9 +95,10 @@ jobs:
 
       - name: Install Qt
         run: |
+            set -ueo pipefail
             python3 -m pip install -U pip
             python3 -m pip install aqtinstall
-            aqt install-qt linux desktop ${{ matrix.qt-version }} -O /Qt -m qtscript --archives qtbase qtmultimedia qtsvg qtscript qttools qtserialport qtimageformats icu qtwayland
+            aqt install-qt linux desktop "${{ matrix.qt-version }}.*" -O /Qt -m qtscript --archives qtbase qtmultimedia qtsvg qtscript qttools qtserialport qtimageformats icu qtwayland
             #            aqt install-tool linux desktop tools_ifw -O /Qt
             echo "Qt5_Dir=$(ls -1d /Qt/5*/* | head -n 1)" >> $GITHUB_ENV
             echo "IQTA_TOOLS=/Qt/Tools" >> $GITHUB_ENV

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - qt-version: '5.12.12'
+          - qt-version: '5.12'
             mingw-version: 7.3
             mingw-short-version: 73
             python-version: 3.8
@@ -56,7 +56,7 @@ jobs:
     steps:
 
       - name: Cancel Previous Workflow Runs
-        uses: n1hility/cancel-previous-runs@v2.0
+        uses: n1hility/cancel-previous-runs@v3.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -91,13 +91,14 @@ jobs:
             git config --global core.autocrlf true
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
         with:
           dir: C:\
-          version: ${{matrix.qt-version}}
+          version: '${{matrix.qt-version}}.*'
           arch: win32_mingw${{matrix.mingw-short-version}}
           modules: 'qtscript'
-          tools: 'tools_mingw,${{matrix.mingw-version}}.0,qt.tools.win32_mingw${{matrix.mingw-short-version}}0'
+          archives: 'qtbase qtmultimedia qtsvg qtscript qttools qtserialport qtimageformats qtwinextras'
+          tools: 'tools_mingw,qt.tools.win32_mingw${{matrix.mingw-short-version}}0'
           extra: '--external 7z'
 
       - name: Checkout repository

diff --git a/installer/packages/qreal-base/ru.qreal.root/meta/prebuild-win32.sh b/installer/packages/qreal-base/ru.qreal.root/meta/prebuild-win32.sh
@@ -46,9 +46,8 @@ rsync -a "$QT_LIB"/Qt5Xml.dll                                        "$PWD"/../d
 rsync -a "$QT_LIB"/Qt5Script.dll                                     "$PWD"/../data
 rsync -a "$QT_LIB"/Qt5Test.dll                                       "$PWD"/../data
 rsync -a "$QT_LIB"/Qt5Concurrent.dll                                 "$PWD"/../data
-rsync -a "$QT_LIB"/libgcc_s_*-1.dll                                  "$PWD"/../data
-rsync -a "$QT_LIB"/libwinpthread-1.dll                               "$PWD"/../data
-rsync -a "$QT_LIB"/libstdc++-6.dll                                   "$PWD"/../data
+rsync -a "$QT_LIB"/                                  "$PWD"/../data
+rsync -a --ignore-missing-args "$QT_LIB"/{libgcc_s_*-1.dll,libwinpthread-1.dll,libstdc++-6.dll}   "$PWD"/../data
 
 rsync -a "$QT_LIB"/../plugins/platforms/q{windows,offscreen,minimal}.dll                        "$PWD"/../data/platforms
 rsync -a "$QT_LIB"/../plugins/imageformats/qsvg.dll                         "$PWD"/../data/imageformats

diff --git a/plugins/robots/thirdparty/trikRuntime/trikRuntime b/plugins/robots/thirdparty/trikRuntime/trikRuntime