File tree Expand file tree Collapse file tree 3 files changed +6
-4
lines changed Expand file tree Collapse file tree 3 files changed +6
-4
lines changed Original file line number Diff line number Diff line change 87
87
shell : pwsh
88
88
run : |
89
89
iwr "https://www.7-zip.org/a/7z$($env:VERSION_7ZIP.Replace('.', ''))-x64.exe" -OutFile D:\7zip.exe
90
- Start-Process -Wait D:\7zip.exe -ArgumentList /S, /D=$PWD \7zip\app
90
+ Start-Process -Wait D:\7zip.exe -ArgumentList /S, /D=. \7zip\app
91
91
# just a stub manifest, will be replaced later
92
- Set-Content $PWD \7zip\pog.psd1 '@{Private = $true; Enable = {Export-Command "7z" "./app/7z.exe" -VcRedist}}'
92
+ Set-Content . \7zip\pog.psd1 '@{Private = $true; Enable = {Export-Command "7z" "./app/7z.exe" -VcRedist}}'
93
93
94
94
- name : Verify build dependencies
95
95
shell : pwsh
@@ -133,6 +133,7 @@ jobs:
133
133
# add to PATH for following steps
134
134
Add-Content $env:GITHUB_PATH (Resolve-Path .\data\package_bin)
135
135
136
+ # reinstall 7zip with correct manifest
136
137
pog 7zip -Force
137
138
138
139
Original file line number Diff line number Diff line change @@ -245,7 +245,7 @@ function Get-PogDownloadCache {
245
245
246
246
process {
247
247
foreach ($pn in $PackageName ) {
248
- $Result = $Entries | ListEntries {$_.PackageName -eq $pn }
248
+ $Result = $Entries | ListEntries {$_.PackageName -eq $pn } | sort Version - Descending
249
249
if ($Result ) {
250
250
echo $Result
251
251
} else {
@@ -255,4 +255,4 @@ function Get-PogDownloadCache {
255
255
}
256
256
}
257
257
}
258
- }
258
+ }
Original file line number Diff line number Diff line change @@ -189,6 +189,7 @@ function Get-HashFromChecksumText {
189
189
}
190
190
}
191
191
192
+ # FIXME: shouldn't this be called something like Get-HashFromChecksumUrl?
192
193
function Get-HashFromChecksumFile {
193
194
# ## . SYNOPSIS
194
195
# ## Retrieves `$Uri`, parses the text as a shasum-like checksum file and retrieves the hash for `$FileName` or `$Pattern`.
You can’t perform that action at this time.
0 commit comments