From df868c0dd3b29d1295e6e0258944180c206a1011 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 28 May 2020 09:15:23 +0200 Subject: [PATCH 1/3] fix github action windows --- .github/workflows/CompileAndRelease.yml | 1 + .github/workflows/CompileWindows.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 9ddbb858d..81421668e 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -197,6 +197,7 @@ jobs: uses: jurplel/install-qt-action@v2 with: modules: qtscript xmlpatterns + version: '5.12.9' #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Build MeshLab run: | diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/CompileWindows.yml index 97c2f6e9a..60921f3be 100644 --- a/.github/workflows/CompileWindows.yml +++ b/.github/workflows/CompileWindows.yml @@ -31,6 +31,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: + version: '5.12.9' modules: qtscript xmlpatterns #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Build MeshLab @@ -79,6 +80,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: + version: '5.12.9' modules: qtscript xmlpatterns #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Setup env variables From 78a7319d055071abc7c72797cdfb2a9ffa9aebb4 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 28 May 2020 09:50:12 +0200 Subject: [PATCH 2/3] switch to qt 5.15 on windows --- .github/workflows/CompileAndRelease.yml | 2 +- .github/workflows/CompileWindows.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 81421668e..4e7591cb8 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -197,7 +197,7 @@ jobs: uses: jurplel/install-qt-action@v2 with: modules: qtscript xmlpatterns - version: '5.12.9' + version: '5.15.0' #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Build MeshLab run: | diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/CompileWindows.yml index 60921f3be..93273eb30 100644 --- a/.github/workflows/CompileWindows.yml +++ b/.github/workflows/CompileWindows.yml @@ -31,7 +31,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.12.9' + version: '5.15.0' modules: qtscript xmlpatterns #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Build MeshLab @@ -80,7 +80,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.12.9' + version: '5.15.0' modules: qtscript xmlpatterns #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Setup env variables From 25bee8ddc5c49b71ac9205380f612f4fa1217b9b Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 28 May 2020 09:57:35 +0200 Subject: [PATCH 3/3] qt 5.14.2 on windows --- .github/workflows/CompileAndRelease.yml | 2 +- .github/workflows/CompileWindows.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CompileAndRelease.yml b/.github/workflows/CompileAndRelease.yml index 4e7591cb8..7903f7293 100755 --- a/.github/workflows/CompileAndRelease.yml +++ b/.github/workflows/CompileAndRelease.yml @@ -197,7 +197,7 @@ jobs: uses: jurplel/install-qt-action@v2 with: modules: qtscript xmlpatterns - version: '5.15.0' + version: '5.14.2' #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Build MeshLab run: | diff --git a/.github/workflows/CompileWindows.yml b/.github/workflows/CompileWindows.yml index 93273eb30..43e84a00d 100644 --- a/.github/workflows/CompileWindows.yml +++ b/.github/workflows/CompileWindows.yml @@ -31,7 +31,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.15.0' + version: '5.14.2' modules: qtscript xmlpatterns #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Build MeshLab @@ -80,7 +80,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '5.15.0' + version: '5.14.2' modules: qtscript xmlpatterns #mirror: 'http://mirrors.ocf.berkeley.edu/qt/' - name: Setup env variables