Skip to content

Commit cdc9f15

Browse files
committed
- move qt version variable
1 parent 65a53a3 commit cdc9f15

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

.circleci/config.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
version: 2.1
22
orbs:
33
win: circleci/windows@5.0
4+
parameters:
5+
qt_version:
6+
type: string
7+
default: "6.5.3"
48
jobs:
59
Windows x64:
610
executor:
711
name: win/default
812
size: large
13+
environment:
14+
QT_VERSION: << pipeline.parameters.qt_version >>
915
steps:
1016
- run:
1117
name: LFS Install
@@ -21,7 +27,7 @@ jobs:
2127
name: Qt Install
2228
command: |
2329
python -m pip install --upgrade pip
24-
python $Env:CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=6.5.3
30+
python $Env:CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=$Env:QT_VERSION
2531
- run:
2632
name: Checkout Deps
2733
command: python $Env:CIRCLE_WORKING_DIRECTORY/Scripts/make.py --checkout
@@ -33,14 +39,14 @@ jobs:
3339
command: python $Env:CIRCLE_WORKING_DIRECTORY/Scripts/make.py --premake
3440
- run:
3541
name: Build
36-
command: python $Env:CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=6.5.3 --build
42+
command: python $Env:CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=$Env:QT_VERSION --build
3743
- run:
3844
name: Archive
3945
command: |
4046
if (-not [string]::IsNullOrWhiteSpace($Env:CIRCLE_TAG)) {
41-
python $Env:CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=6.5.3 --archive=release
47+
python $Env:CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=$Env:QT_VERSION --archive=release
4248
} else {
43-
python $Env:CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=6.5.3 --archive
49+
python $Env:CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=$Env:QT_VERSION --archive
4450
}
4551
mkdir Archive
4652
xcopy *.zip Archive\
@@ -51,6 +57,8 @@ jobs:
5157
machine:
5258
image: ubuntu-2004:current
5359
resource_class: large
60+
environment:
61+
QT_VERSION: << pipeline.parameters.qt_version >>
5462
steps:
5563
- run:
5664
name: LFS Install
@@ -70,7 +78,7 @@ jobs:
7078
sudo apt update
7179
sudo apt install -y p7zip-full libgl1-mesa-dev
7280
python3 -m pip install --upgrade pip
73-
python3 $CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=6.5.3
81+
python3 $CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=$QT_VERSION
7482
- run:
7583
name: Checkout Deps
7684
command: python3 $CIRCLE_WORKING_DIRECTORY/Scripts/make.py --checkout
@@ -82,7 +90,7 @@ jobs:
8290
command: python3 $CIRCLE_WORKING_DIRECTORY/Scripts/make.py --premake
8391
- run:
8492
name: Build
85-
command: python3 $CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=6.5.3 --build
93+
command: python3 $CIRCLE_WORKING_DIRECTORY/Scripts/make.py --aqt=$QT_VERSION --build
8694

8795
workflows:
8896
Nightly:

0 commit comments

Comments
 (0)