Skip to content

Commit 3395697

Browse files
committed
Downgrade fluent-bit until we can solve CI issues in newer version.
1 parent 430b73f commit 3395697

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

tasks/deps/fluent-bit

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
set -e -u -x
44
source ./tasks/helpers.sh
55

6-
fluent_bit_version="4.0.3"
7-
fluent_bit_hash="c7d276238d25242467218941842d8cd4df6cfa52cc9379ae5755220cdefd1dc1"
6+
# Hold at 3.2 instead of 4.0 until we can solve testing issues in
7+
# `test/processes/test_fluent_bit.rb` encountered in 4.0.
8+
fluent_bit_version="3.2.10"
9+
fluent_bit_hash="f86ecbe208ae152841909a063f28ca250b8a6771c5e43dcb1786ef310f927904"
810

911
task_working_dir
1012
download "https://github.com/fluent/fluent-bit/archive/refs/tags/v${fluent_bit_version}.tar.gz" "sha256" "$fluent_bit_hash"

tasks/outdated.thor

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ class Outdated < Thor
2525
},
2626
"fluent_bit" => {
2727
:git => "https://github.com/fluent/fluent-bit.git",
28+
:constraint => "~> 3.2.10",
2829
:download => "https://github.com/fluent/fluent-bit/archive/refs/tags/v<%= version.fetch(:wanted_version) %>.tar.gz",
2930
},
3031
"glauth" => {
@@ -89,6 +90,8 @@ class Outdated < Thor
8990
"trafficserver" => {
9091
:http => "https://archive.apache.org/dist/trafficserver/",
9192
:constraint => "~> 9.1.0",
93+
:checksums_download => "https://archive.apache.org/dist/trafficserver/trafficserver-<%= version.fetch(:wanted_version) %>.tar.bz2.sha512",
94+
:filename_matcher => /trafficserver.*\.tar\.bz2/,
9295
},
9396
}.freeze
9497

@@ -174,6 +177,7 @@ class Outdated < Thor
174177

175178
amd64_hash = nil
176179
arm64_hash = nil
180+
source_hash = nil
177181

178182
if repo[:github_release]
179183
release_json_path = tmp_dir.join("github_release.json")
@@ -220,6 +224,8 @@ class Outdated < Thor
220224
amd64_hash = parts.first
221225
elsif line.match?(/linux.*(arm64|aarch_?64)/i)
222226
arm64_hash = parts.first
227+
else
228+
source_hash = parts.first
223229
end
224230
end
225231
end

0 commit comments

Comments
 (0)