Skip to content

Commit c2cb848

Browse files
committed
msi: fetch CloudFlare R2 first
Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
1 parent 5763070 commit c2cb848

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

fluent-package/msi/pkgsize-test.ps1

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
$ErrorActionPreference = 'Stop'
22

3-
$base_uri = "http://packages.treasuredata.com.s3.amazonaws.com"
3+
$base_uri = "https://fluentd.cdn.cncf.io"
44
&git fetch --unshallow
55
try {
66
$previous_version = (git describe --abbrev=0 --tags) -Replace "v",""
77
"Previous version from git: {0}" -F $previous_version | Write-Host
8-
$previous_msi_name = "td-agent-${previous_version}-x64.msi"
9-
$response = Invoke-WebRequest -Uri "${base_uri}/4/windows/${previous_msi_name}" -OutFile $previous_msi_name -PassThru
8+
$previous_msi_name = "fluent-package-${previous_version}-x64.msi"
9+
$previous_major_version = ([version]$previous_version).Major
10+
$response = Invoke-WebRequest -Uri "${base_uri}/lts/${previous_major_version}/windows/${previous_msi_name}" -OutFile $previous_msi_name -PassThru
1011
}
1112
catch {
12-
$heroku_uri = 'http://td-agent-package-browser.herokuapp.com'
13+
$heroku_uri = 'https://td-agent-package-browser.herokuapp.com'
1314
Write-Host "An exception was caught: $($_.Exception.Message). Try to find previous version in ${heroku_uri} instead"
14-
$msi_links = (Invoke-WebRequest -Uri "${heroku_uri}/4/windows").Links.href | Where-Object {$_ -like "*.msi"}
15+
$msi_links = (Invoke-WebRequest -Uri "${heroku_uri}/lts/6/windows/index.html").Links.href | Where-Object {$_ -like "*.msi"}
1516
$msi_versions = $($msi_links | Select-String '(\d+\.\d+\.\d+)' | ForEach-Object { $_.Matches[0].Groups[1].Value }) | Sort-Object {[version] $_}
1617
$previous_version = $msi_versions | Select-Object -Last 1
1718
"Previous version from {0}: {1}" -F ${heroku_uri}, $previous_version | Write-Host
18-
$previous_msi_name = "td-agent-${previous_version}-x64.msi"
19-
$response = Invoke-WebRequest -Uri "${base_uri}/4/windows/${previous_msi_name}" -OutFile $previous_msi_name -PassThru
19+
$previous_msi_name = "fluent-package-${previous_version}-x64.msi"
20+
$response = Invoke-WebRequest -Uri "${base_uri}/lts/6/windows/${previous_msi_name}" -OutFile $previous_msi_name -PassThru
2021
}
2122

2223
$msi = (Get-Item "fluent-package\\msi\\repositories\\fluent-package-*.msi") | Sort-Object -Descending { $_.LastWriteTime } | Select-Object -First 1

0 commit comments

Comments
 (0)