Skip to content

Commit b00646b

Browse files
committed
ci, refactor: Rename VCPKG_TAG variable and vcpkg_cache script
The VCPKG_TAG variable renamed to CI_VCPKG_TAG to prevent any possible name clash with vcpkg-specific variables. The vcpkg_cache script renamed into more meaningful one.
1 parent c8bae2b commit b00646b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ task:
8585
env:
8686
PATH: 'C:\jom;C:\Python39;C:\Python39\Scripts;C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin;%PATH%'
8787
PYTHONUTF8: 1
88-
VCPKG_TAG: '2021.05.12'
88+
CI_VCPKG_TAG: '2021.05.12'
8989
QT_DOWNLOAD_URL: 'https://download.qt.io/official_releases/qt/5.12/5.12.11/single/qt-everywhere-src-5.12.11.zip'
9090
QT_LOCAL_PATH: 'C:\qt-everywhere-src-5.12.11.zip'
9191
QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.12.11'
@@ -120,7 +120,7 @@ task:
120120
- ..\configure -release -silent -opensource -confirm-license -opengl desktop -no-shared -static -static-runtime -mp -qt-zlib -qt-pcre -qt-libpng -no-libjpeg -nomake examples -nomake tests -nomake tools -no-dbus -no-libudev -no-icu -no-gtk -no-opengles3 -no-angle -no-sql-sqlite -no-sql-odbc -no-sqlite -no-libudev -no-vulkan -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtcanvas3d -skip qtcharts -skip qtconnectivity -skip qtdatavis3d -skip qtdeclarative -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmacextras -skip qtmultimedia -skip qtnetworkauth -skip qtpurchasing -skip qtquickcontrols -skip qtquickcontrols2 -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qtvirtualkeyboard -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtx11extras -skip qtxmlpatterns -no-openssl -no-feature-sql -no-feature-sqlmodel -prefix %QTBASEDIR%
121121
- jom
122122
- jom install
123-
vcpkg_cache:
123+
vcpkg_binary_cache:
124124
folder: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives'
125125
install_python_script:
126126
- choco install --yes --no-progress python3 --version=3.9.6
@@ -130,7 +130,7 @@ task:
130130
- cd ..
131131
- git clone --quiet https://github.com/microsoft/vcpkg.git
132132
- cd vcpkg
133-
- git -c advice.detachedHead=false checkout %VCPKG_TAG%
133+
- git -c advice.detachedHead=false checkout %CI_VCPKG_TAG%
134134
- .\bootstrap-vcpkg -disableMetrics
135135
- echo set(VCPKG_BUILD_TYPE release) >> triplets\x64-windows-static.cmake
136136
- .\vcpkg integrate install

0 commit comments

Comments
 (0)