Skip to content

Commit 587c91f

Browse files
authored
fix: override installed windows (#174)
* test: use older windows version * ci: add test to install latest aws cli version * fix: add validation for latest
1 parent a8e762a commit 587c91f

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

.circleci/test-deploy.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,17 @@ workflows:
229229
post-steps:
230230
- check_aws_version:
231231
version: "2.1.10"
232+
- integration-test-install:
233+
name: integration-test-install-override-version-with-latest-<<matrix.executor>>
234+
context: [CPE_ORBS_AWS]
235+
matrix:
236+
alias: test-install-override-version-with-latest
237+
parameters:
238+
executor: ["linuxvm", "windows", "arm"]
239+
install_dir: "/usr/local/aws-cli"
240+
binary_dir: ""
241+
override_installed: true
242+
filters: *filters
232243
- integration-test-role-arn-setup:
233244
name: integration-test-role-arn-config
234245
source_profile: default
@@ -247,7 +258,7 @@ workflows:
247258
pub_type: production
248259
enable_pr_comment: true
249260
context: orb-publisher
250-
requires: [orb-tools/pack, test-install, test-install-version, test-install-override-version, integration-test-web-identity-with-profile, integration test web identity command with white spaces,integration-test-role-arn-config]
261+
requires: [orb-tools/pack, test-install, test-install-version, test-install-override-version, integration-test-web-identity-with-profile, integration test web identity command with white spaces,integration-test-role-arn-config, test-install-override-version-with-latest]
251262
filters: *release-filters
252263
executors:
253264
terraform:
@@ -275,7 +286,7 @@ executors:
275286
image: ubuntu-2004:202101-01
276287
windows:
277288
machine:
278-
image: windows-server-2019-vs2019:stable
289+
image: windows-server-2019-vs2019:2023.04.1
279290
shell: bash.exe
280291
resource_class: windows.medium
281292
commands:

src/scripts/windows/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Install_AWS_CLI(){
1616

1717
choco install awscli --version="$version"
1818
echo "Installing AWS CLI version $version"
19-
if echo "$1" | grep "2."; then
19+
if echo "$1" | grep -e "2." -e "latest"; then
2020
echo "export PATH=\"\${PATH}:/c/Program Files/Amazon/AWSCLIV2\"" >> "$BASH_ENV"
2121
else
2222
echo "export PATH=\"\${PATH}:/c/Program Files/Amazon/AWSCLI/bin\"" >>"$BASH_ENV"
@@ -28,5 +28,5 @@ Uninstall_AWS_CLI() {
2828
echo "Chocolatey is required to uninstall AWS"
2929
exit 1
3030
fi
31-
choco uninstall awscli
31+
choco uninstall awscli
3232
}

0 commit comments

Comments
 (0)