Skip to content

Commit 5599086

Browse files
authored
ci: add missing fluent-package-v6 branch (#948)
Signed-off-by: Kentaro Hayashi <[email protected]>
1 parent bbb2a8d commit 5599086

File tree

8 files changed

+18
-6
lines changed

8 files changed

+18
-6
lines changed

.github/workflows/apt-arm.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- master
66
- fluent-package-v5
7+
- fluent-package-v6
78
pull_request:
89
concurrency:
910
group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}

.github/workflows/apt.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- master
66
- fluent-package-v5
7+
- fluent-package-v6
78
pull_request:
89
concurrency:
910
group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}

.github/workflows/bundle-audit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- master
66
- fluent-package-v5
7+
- fluent-package-v6
78
pull_request:
89
workflow_dispatch:
910
concurrency:

.github/workflows/macos.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- master
66
- fluent-package-v5
7+
- fluent-package-v6
78
pull_request:
89
concurrency:
910
group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}

.github/workflows/windows.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- master
66
- fluent-package-v5
7+
- fluent-package-v6
78
pull_request:
89
concurrency:
910
group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}

.github/workflows/yum-arm.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- master
66
- fluent-package-v5
7+
- fluent-package-v6
78
pull_request:
89
concurrency:
910
group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}

.github/workflows/yum.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- master
66
- fluent-package-v5
7+
- fluent-package-v6
78
pull_request:
89
concurrency:
910
group: ${{ github.head_ref || github.sha }}-${{ github.workflow }}

fluent-package/msi/pkgsize-test.ps1

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

3+
$PSVersionTable
4+
35
$base_uri = "http://packages.treasuredata.com.s3.amazonaws.com"
46
&git fetch --unshallow
7+
$previous_version = (git describe --abbrev=0 --tags) -Replace "v",""
8+
$major_version = ([version] $previous_version).Major
59
try {
6-
$previous_version = (git describe --abbrev=0 --tags) -Replace "v",""
710
"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
11+
$previous_msi_name = "fluent-package-${previous_version}-x64.msi"
12+
$response = Invoke-WebRequest -UseBasicParsing -Uri "${base_uri}/${major_version}/windows/${previous_msi_name}" -OutFile $previous_msi_name -PassThru
1013
}
1114
catch {
1215
$heroku_uri = 'http://td-agent-package-browser.herokuapp.com'
1316
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"}
17+
"Checking package major version: {0}" -F $major_version | Write-Host
18+
"Checking {0}/{1}/windows" -F $heroku_uri, $major_version | Write-Host
19+
$msi_links = (Invoke-WebRequest -UseBasicParsing -Uri "${heroku_uri}/${major_version}/windows").Links.href | Where-Object {$_ -like "*.msi"}
1520
$msi_versions = $($msi_links | Select-String '(\d+\.\d+\.\d+)' | ForEach-Object { $_.Matches[0].Groups[1].Value }) | Sort-Object {[version] $_}
1621
$previous_version = $msi_versions | Select-Object -Last 1
1722
"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
23+
$previous_msi_name = "fluent-package-${previous_version}-x64.msi"
24+
$response = Invoke-WebRequest -UseBasicParsing -Uri "${base_uri}/${major_version}/windows/${previous_msi_name}" -OutFile $previous_msi_name -PassThru
2025
}
2126

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

0 commit comments

Comments
 (0)