Skip to content

Commit 9c6e88d

Browse files
author
Michael Fero
committed
ci: Correcting archive package names
1 parent f3dbe75 commit 9c6e88d

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

appveyor.ps1

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,10 @@ Function Initialize-Build-Environment {
118118

119119
# Determine which header file to use for determine driver version
120120
$driver_header_file = "cassandra.h"
121+
$driver_archive_prefix = "cassandra"
121122
If ($Env:DRIVER_TYPE -Like "dse") {
122123
$driver_header_file = "dse.h"
124+
$driver_archive_prefix = "dse"
123125
}
124126

125127
# Get the driver version number from the header file
@@ -183,15 +185,15 @@ Function Initialize-Build-Environment {
183185
# Generate the archive name for the driver test and examples artifacts
184186
$build_version = "$($Env:APPVEYOR_BUILD_NUMBER)-$($Env:APPVEYOR_REPO_BRANCH)"
185187
# TODO: Re-enable OpenSSL version appending if multiple OpenSSL versions are enabled
186-
#$Env:DRIVER_ARTIFACT_EXAMPLES_ARCHIVE = "$($Env:DRIVER_TYPE.ToLower())-cpp-driver-$($Env:DRIVER_VERSION)-examples-openssl-$($Env:OPENSSL_MAJOR_MINOR)-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
187-
#$Env:DRIVER_ARTIFACT_TESTS_ARCHIVE = "$($Env:DRIVER_TYPE.ToLower())-cpp-driver-$($Env:DRIVER_VERSION)-tests-openssl-$($Env:OPENSSL_MAJOR_MINOR)-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
188-
$Env:DRIVER_ARTIFACT_EXAMPLES_ARCHIVE = "$($Env:DRIVER_TYPE.ToLower())-cpp-driver-$($Env:DRIVER_VERSION)-examples-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
189-
$Env:DRIVER_ARTIFACT_TESTS_ARCHIVE = "$($Env:DRIVER_TYPE.ToLower())-cpp-driver-$($Env:DRIVER_VERSION)-tests-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
188+
#$Env:DRIVER_ARTIFACT_EXAMPLES_ARCHIVE = "$($driver_archive_prefix)-cpp-driver-$($Env:DRIVER_VERSION)-examples-openssl-$($Env:OPENSSL_MAJOR_MINOR)-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
189+
#$Env:DRIVER_ARTIFACT_TESTS_ARCHIVE = "$($driver_archive_prefix)-cpp-driver-$($Env:DRIVER_VERSION)-tests-openssl-$($Env:OPENSSL_MAJOR_MINOR)-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
190+
$Env:DRIVER_ARTIFACT_EXAMPLES_ARCHIVE = "$($driver_archive_prefix)-cpp-driver-$($Env:DRIVER_VERSION)-examples-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
191+
$Env:DRIVER_ARTIFACT_TESTS_ARCHIVE = "$($driver_archive_prefix)-cpp-driver-$($Env:DRIVER_VERSION)-tests-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
190192

191193
# Generate the archive name for the driver packaging
192194
# TODO: Re-enable OpenSSL version appending if multiple OpenSSL versions are enabled
193-
#$Env:DRIVER_ARTIFACT_ARCHIVE = "$($Env:DRIVER_TYPE.ToLower())-cpp-driver-$($Env:DRIVER_VERSION)-openssl-$($Env:OPENSSL_MAJOR_MINOR)-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
194-
$Env:DRIVER_ARTIFACT_ARCHIVE = "$($Env:DRIVER_TYPE.ToLower())-cpp-driver-$($Env:DRIVER_VERSION)-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
195+
#$Env:DRIVER_ARTIFACT_ARCHIVE = "$($driver_archive_prefix)-cpp-driver-$($Env:DRIVER_VERSION)-openssl-$($Env:OPENSSL_MAJOR_MINOR)-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
196+
$Env:DRIVER_ARTIFACT_ARCHIVE = "$($driver_archive_prefix)-cpp-driver-$($Env:DRIVER_VERSION)-win$($architecture)-msvc$($Env:VISUAL_STUDIO_INTERNAL_VERSION).zip"
195197

196198
# Generate additional download/install environments for third party build requirements
197199
$Env:BISON_BINARIES_ARCHIVE = "bison-$($bison_version)-bin.zip"

0 commit comments

Comments
 (0)