diff options
| author | Raphael Cotty <raphael.cotty@gmail.com> | 2021-12-05 19:49:17 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-12-13 10:50:40 +0000 |
| commit | 137e1f968935a583a18c6a9c567ad043aff91360 (patch) | |
| tree | e5c6c19cd8d4828dbcf29ffaa030a4f59ab10e38 | |
| parent | be7d896f4963663c5725c0c35637755c40fe3c0e (diff) | |
Fix CI for building releasev1.21.0
.. by partially cherry-picking d5fa3a4eb279c1ad9f0247156e5cf015261e39f0.
Change-Id: I646b1ca34d5955de7b7770ccd8328a3eea797ee3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | .github/actions/download-qtc/action.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rwxr-xr-x | scripts/install-qt.sh | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.github/actions/download-qtc/action.yml b/.github/actions/download-qtc/action.yml index d6ed2e6f8..292991b38 100644 --- a/.github/actions/download-qtc/action.yml +++ b/.github/actions/download-qtc/action.yml @@ -4,7 +4,7 @@ inputs: version: description: 'Qt Creator version' required: false - default: '4.14.2' + default: '5.0.3' runs: using: "composite" steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f5ac0a63..bb1c63ef1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,7 +99,7 @@ jobs: - name: Install Qt Creator uses: ./.github/actions/download-qtc with: - version: 4.14.2 + version: 5.0.3 - name: Setup Qbs run: | qbs setup-toolchains --detect diff --git a/scripts/install-qt.sh b/scripts/install-qt.sh index 26ffc5996..8af82ccbc 100755 --- a/scripts/install-qt.sh +++ b/scripts/install-qt.sh @@ -224,7 +224,6 @@ fi MIRRORS="\ http://ftp.acc.umu.se/mirror/qt.io/qtproject \ - http://qt.mirrors.tds.net/qt \ http://ftp.fau.de/qtproject \ http://download.qt.io \ " |