Skip to content

Commit 28daa2e

Browse files
committed
update tests to use version instead of tag
Signed-off-by: Justin Alvarez <alvajus@amazon.com>
1 parent 3a9e63e commit 28daa2e

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

.github/workflows/build-and-test-msi.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ jobs:
8686
$tag="${{ needs.get-tag-name.outputs.tag }}"
8787
powershell .\msi-builder\BuildFinchMSI.ps1 -Version $version
8888
$timestamp=[math]::truncate((Get-Date (Get-Date).ToUniversalTime() -UFormat "%s"))
89-
$unsignedMSI="Finch-$tag-$timestamp.msi"
89+
$unsignedMSI="Finch-$version-$timestamp.msi"
9090
Write-Host "Upload unsigned MSI: $unsignedMSI"
9191
9292
aws s3 cp "./msi-builder/build/Finch-$version.msi" "${{ secrets.WINDOWS_UNSIGNED_BUCKET }}$unsignedMSI" --acl bucket-owner-full-control --no-progress
9393
New-Item -Path "./msi-builder/build/signed/" -ItemType Directory -Force
9494
95-
Write-Host "Attemp to download signed MSI"
95+
Write-Host "Attempt to download signed MSI"
9696
$retryCount = 0
9797
$maxRetries = 20
9898
$delay = 5
@@ -102,7 +102,7 @@ jobs:
102102
$signedMSI = aws s3 ls ${{ secrets.WINDOWS_SIGNED_BUCKET }} 2>&1 | Where-Object { $_ -match "$unsignedMSI" } | Sort-Object -Descending | Select-Object -First 1 | ForEach-Object { ($_ -split '\s+')[-1] }
103103
if ($signedMSI -and ($signedMSI -notlike "*An error occurred (404) when calling the HeadObject operation*")) {
104104
try {
105-
aws s3 cp "${{ secrets.WINDOWS_SIGNED_BUCKET }}$signedMSI" "./msi-builder/build/signed/Finch-$tag.msi"
105+
aws s3 cp "${{ secrets.WINDOWS_SIGNED_BUCKET }}$signedMSI" "./msi-builder/build/signed/Finch-$version.msi"
106106
break
107107
} catch {
108108
Write-Host "Error during copy: $_"
@@ -124,8 +124,8 @@ jobs:
124124
aws-region: ${{ secrets.REGION }}
125125
- name: upload signed MSI to S3
126126
run: |
127-
$tag="${{ needs.get-tag-name.outputs.tag }}"
128-
aws s3 cp "./msi-builder/build/signed/Finch-$tag.msi" "s3://${{ secrets.INSTALLER_PRIVATE_BUCKET_NAME }}/Finch-$tag.msi" --no-progress
127+
$version="${{ needs.get-tag-name.outputs.version }}"
128+
aws s3 cp "./msi-builder/build/signed/Finch-$version.msi" "s3://${{ secrets.INSTALLER_PRIVATE_BUCKET_NAME }}/Finch-$version.msi" --no-progress
129129
- name: Remove Finch VM and Clean Up Previous Environment
130130
if: ${{ always() }}
131131
timeout-minutes: 2
@@ -195,8 +195,8 @@ jobs:
195195
}
196196
- name: Download MSI from S3
197197
run: |
198-
$tag="${{ needs.get-tag-name.outputs.tag }}"
199-
aws s3 cp "s3://${{ secrets.INSTALLER_PRIVATE_BUCKET_NAME }}/Finch-$tag.msi" ./Finch.msi
198+
$version="${{ needs.get-tag-name.outputs.version }}"
199+
aws s3 cp "s3://${{ secrets.INSTALLER_PRIVATE_BUCKET_NAME }}/Finch-$version.msi" ./Finch.msi
200200
- name: Install MSI silently
201201
run: |
202202
Start-Process 'Finch.msi' -ArgumentList '/quiet' -Wait

.github/workflows/build-and-test-pkg.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
arch: arm64
4141
output_arch: aarch64
4242
version: 14
43-
tag: ${{ needs.get-tag-name.outputs.tag }}
43+
finch_version: ${{ needs.get-tag-name.outputs.version }}
4444

4545
macos-x86-64-pkg-build:
4646
needs: get-tag-name
@@ -51,7 +51,7 @@ jobs:
5151
arch: amd64
5252
output_arch: x86_64
5353
version: 14
54-
tag: ${{ needs.get-tag-name.outputs.tag }}
54+
finch_version: ${{ needs.get-tag-name.outputs.version }}
5555

5656
macos-aarch64-pkg-test:
5757
strategy:
@@ -68,7 +68,7 @@ jobs:
6868
arch: arm64
6969
output_arch: aarch64
7070
version: ${{ matrix.version }}
71-
tag: ${{ needs.get-tag-name.outputs.tag }}
71+
finch_version: ${{ needs.get-tag-name.outputs.version }}
7272

7373
macos-x86-64-pkg-test:
7474
strategy:
@@ -85,4 +85,4 @@ jobs:
8585
arch: amd64
8686
output_arch: x86_64
8787
version: ${{ matrix.version }}
88-
tag: ${{ needs.get-tag-name.outputs.tag }}
88+
finch_version: ${{ needs.get-tag-name.outputs.version }}

0 commit comments

Comments
 (0)