Skip to content

Commit 9aad521

Browse files
authored
Merge pull request #1432 from iakov/master
Revert to Qt 5.12
2 parents eae2462 + f8b70ba commit 9aad521

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

.github/workflows/main.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,21 @@ jobs:
3737
fail-fast: false
3838
matrix:
3939
include:
40-
# - qt-version: '5.12.10'
41-
# mingw-version: 7.3
42-
# mingw-short-version: 73
43-
# python-version: 3.8
40+
- qt-version: '5.12.11'
41+
mingw-version: 7.3
42+
mingw-short-version: 73
43+
python-version: 3.8
44+
deploy-installer: true
45+
4446
- qt-version: '5.15.2'
4547
mingw-version: 8.1
4648
mingw-short-version: 81
4749
python-version: 3.8
50+
4851
defaults:
4952
run:
5053
shell: msys2 {0}
54+
5155
steps:
5256

5357
- name: Cancel Previous Workflow Runs
@@ -215,7 +219,7 @@ jobs:
215219
run: echo "GITHUB_REF_SLUG=${{ env.CURRENT_TAG }}" >> $GITHUB_ENV
216220

217221
- name: Deploy installer
218-
if: ${{ github.event_name != 'pull_request' && github.repository_owner == 'trikset'}}
222+
if: ${{ matrix.deploy-installer && github.event_name != 'pull_request' && github.repository_owner == 'trikset' }}
219223
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
220224

221225
- name: Prepare for RDP connection

0 commit comments

Comments
 (0)