Skip to content

Commit f4eb1b9

Browse files
authored
Merge pull request #3071 from aws-observability/fixawscli
Set Env and display aws version at the time of signing for visibility
2 parents 8dc6b50 + 099a371 commit f4eb1b9

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

.github/workflows/CI.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ on:
2727
- '**.md'
2828
- 'tools/workflow/**'
2929

30-
# from collector and contrib repo
30+
# from collector and collector-contrib repo
3131
repository_dispatch:
3232
types: [dependency-build, workflow-run]
3333

@@ -240,11 +240,12 @@ jobs:
240240
$create_date = Get-Date -format s
241241
aws s3api put-object "--body" $pkgfile "--bucket" ${{ env.WIN_UNSIGNED_PKG_BUCKET }} "--key" ${{ env.WIN_UNSIGNED_PKG_FOLDER }}/aws-otel-collector-$hash.msi
242242
$objkey = ""
243-
for ($num = 1 ; $num -le 60 ; $num++) { # 60 * 10 = 600s = 10min timeout
244-
Start-Sleep -s 10
243+
for ($num = 1 ; $num -le 10 ; $num++) { # 60 * 10 = 600s = 10min timeout
244+
Start-Sleep -s 90
245245
Write-Output "Poll number $num"
246-
$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine")
246+
msiexec.exe /i https://awscli.amazonaws.com/AWSCLIV2.msi /qn
247247
cmd /c where aws
248+
[System.Environment]::SetEnvironmentVariable('Path',$Env:Path + ";C:\\Program Files\\Amazon\\AWSCLIV2\\aws.exe",'User')
248249
aws --version
249250
$objkey = aws s3api list-objects "--bucket" ${{ env.WIN_SIGNED_PKG_BUCKET }} "--prefix" ${{ env.WIN_SIGNED_PKG_FOLDER }}/aws-otel-collector-$hash.msi "--output" text "--query" "Contents[?LastModified>'$create_date'].Key|[0]"
250251
if ($objkey -ne "None") {

0 commit comments

Comments
 (0)