Skip to content

Commit 03f6273

Browse files
committed
ci: Use the arch string from the matrix
Signed-off-by: Anatol Belski <[email protected]>
1 parent 1be4475 commit 03f6273

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
echo ("GITHUB_SHA_SHORT=" + $env:GITHUB_SHA.substring(0, 7)) | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
2626
$convey_version = [regex]::Match([IO.File]::ReadAllText("Makefile"), 'VERSION\s*=\s*(\S+)').captures.groups[1].value
2727
echo ("CONVEY_VERSION=" + $convey_version) | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
28-
$target_arch = $env:Platform -Replace ".*_"
28+
$target_arch = "${{ matrix.arch }}" -Replace ".*_"
2929
echo ("TARGET_ARCH=" + $target_arch) | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
3030
- name: Compile convey
3131
run: nmake

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
echo ("GITHUB_SHA_SHORT=" + $env:GITHUB_SHA.substring(0, 7)) | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
4949
$convey_version = [regex]::Match([IO.File]::ReadAllText("Makefile"), 'VERSION\s*=\s*(\S+)').captures.groups[1].value
5050
echo ("CONVEY_VERSION=" + $convey_version) | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
51-
$target_arch = $env:Platform -Replace ".*_"
51+
$target_arch = "${{ matrix.arch }}" -Replace ".*_"
5252
echo ("TARGET_ARCH=" + $target_arch) | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
5353
echo ("RELEASE_ASSET_NAME=convey-" + $convey_version + "-" + $target_arch + ".zip") | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
5454
$upload_url = [IO.File]::ReadAllText("release_url/release_url.txt")

0 commit comments

Comments
 (0)