Skip to content

Commit a53183b

Browse files
committed
appveyor: Corrected case of environment variables
1 parent a4d9445 commit a53183b

File tree

1 file changed

+18
-16
lines changed

1 file changed

+18
-16
lines changed

appveyor.yml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ environment:
3838
# Representative for C++14
3939
- job_name: Visual Studio 2017, x64, C++14
4040
appveyor_build_worker_image: Visual Studio 2017
41-
platform: x64
41+
platformtarget: x64
4242
SQLITE_ORM_CXX_STANDARD: ""
4343

4444
- job_name: clang, C++17
@@ -74,17 +74,17 @@ environment:
7474

7575
- job_name: Visual Studio 2022, x64, C++17
7676
appveyor_build_worker_image: Visual Studio 2022
77-
platform: x64
77+
platformtarget: x64
7878
SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_17=ON"
7979

8080
- job_name: Visual Studio 2022, x64, C++20
8181
appveyor_build_worker_image: Visual Studio 2022
82-
platform: x64
82+
platformtarget: x64
8383
SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_20=ON"
8484

8585
- job_name: Visual Studio 2022, x86, C++20
8686
appveyor_build_worker_image: Visual Studio 2022
87-
platform: x86
87+
platformtarget: x86
8888
SQLITE_ORM_CXX_STANDARD: "-DSQLITE_ORM_ENABLE_CXX_20=ON"
8989

9090
matrix:
@@ -99,10 +99,10 @@ for:
9999
- appveyor_build_worker_image: Visual Studio 2022
100100
init:
101101
- |-
102-
echo %appveyor_build_worker_image% - %platform% - %configuration%
102+
echo %appveyor_build_worker_image% - %platformtarget% - %configuration%
103103
cmake --version
104-
if "%platform%"=="x64" (set architecture=-A x64)
105-
if "%platform%"=="x86" (set architecture=-A Win32)
104+
if "%platformtarget%"=="x64" (set architecture=-A x64)
105+
if "%platformtarget%"=="x86" (set architecture=-A Win32)
106106
if "%appveyor_build_worker_image%"=="Visual Studio 2022" (set generator="Visual Studio 17 2022" %architecture%)
107107
if "%appveyor_build_worker_image%"=="Visual Studio 2017" (set generator="Visual Studio 15 2017" %architecture%)
108108
# using custom vcpkg triplets for building and linking dynamic dependent libraries
@@ -113,7 +113,7 @@ for:
113113
cd %APPVEYOR_BUILD_FOLDER%
114114
C:\Tools\vcpkg\bootstrap-vcpkg.bat -disableMetrics
115115
C:\Tools\vcpkg\vcpkg integrate install
116-
set VCPKG_DEFAULT_TRIPLET=%platform%-windows-%configuration%
116+
set VCPKG_DEFAULT_TRIPLET=%platformtarget%-windows-%configuration%
117117
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] --overlay-triplets=vcpkg/triplets
118118
rem The Visual Studio 2017 build worker image comes with CMake 3.16 only, and sqlite_orm will build the Catch2 dependency from source
119119
if not "%appveyor_build_worker_image%"=="Visual Studio 2017" (vcpkg install catch2)
@@ -135,6 +135,7 @@ for:
135135
- appveyor_build_worker_image: Ubuntu
136136
init:
137137
- |-
138+
platformtarget=$(uname -m); case $platformtarget in x86_64) platformtarget=x64;; amd64) platformtarget=x64;; esac; export platformtarget
138139
echo $appveyor_build_worker_image
139140
$CXX --version
140141
cmake --version
@@ -145,26 +146,27 @@ for:
145146
git fetch origin tag 2024.04.26 && git checkout 2024.04.26
146147
popd
147148
$HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
148-
export VCPKG_DEFAULT_TRIPLET=$platform-linux-$configuration
149+
export VCPKG_DEFAULT_TRIPLET=$platformtarget-linux-$CONFIGURATION
149150
$HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
150151
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] catch2 --overlay-triplets=vcpkg/triplets
151152
before_build:
152153
- |-
153154
mkdir compile
154155
cd compile
155-
cmake $SQLITE_ORM_CXX_STANDARD $cmake_build_examples -DCMAKE_BUILD_TYPE=$configuration --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
156+
cmake $SQLITE_ORM_CXX_STANDARD $cmake_build_examples -DCMAKE_BUILD_TYPE=$CONFIGURATION --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
156157
# build examples, and run tests (ie make & make test)
157158
build_script:
158159
- |-
159-
cmake --build . --config $configuration $cmake_build_parallel
160-
ctest --verbose --output-on-failure --build-config $configuration
160+
cmake --build . --config $CONFIGURATION $cmake_build_parallel
161+
ctest --verbose --output-on-failure --build-config $CONFIGURATION
161162
-
162163
# macOS
163164
matrix:
164165
only:
165166
- appveyor_build_worker_image: macOS
166167
init:
167168
- |-
169+
platformtarget=$(uname -m); case $platformtarget in x86_64) platformtarget=x64;; amd64) platformtarget=x64;; esac; export platformtarget
168170
echo $appveyor_build_worker_image
169171
$CXX --version
170172
cmake --version
@@ -173,16 +175,16 @@ for:
173175
- |-
174176
git clone --depth 1 --branch 2024.04.26 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
175177
$HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
176-
export VCPKG_DEFAULT_TRIPLET=$platform-osx-$configuration
178+
export VCPKG_DEFAULT_TRIPLET=$platformtarget-osx-$CONFIGURATION
177179
$HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
178180
vcpkg install sqlite3[core,dbstat,math,json1,fts5,soundex] catch2 --overlay-triplets=vcpkg/triplets
179181
before_build:
180182
- |-
181183
mkdir compile
182184
cd compile
183-
cmake $SQLITE_ORM_CXX_STANDARD -DCMAKE_BUILD_TYPE=$configuration --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
185+
cmake $SQLITE_ORM_CXX_STANDARD -DCMAKE_BUILD_TYPE=$CONFIGURATION --toolchain $HOME/vcpkg/scripts/buildsystems/vcpkg.cmake ..
184186
# build examples, and run tests (ie make & make test)
185187
build_script:
186188
- |-
187-
cmake --build . --config $configuration --parallel
188-
ctest --verbose --output-on-failure --build-config $configuration
189+
cmake --build . --config $CONFIGURATION --parallel
190+
ctest --verbose --output-on-failure --build-config $CONFIGURATION

0 commit comments

Comments
 (0)