Skip to content

Commit 64b48ac

Browse files
Watson1978kenhys
Watson1978
and
kenhys
authored
Move to v6.0.0 (#858)
This pull request move master branch to creating v6.0 package. --------- Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com> Signed-off-by: Shizuo Fujita <fujita@clear-code.com> Co-authored-by: Kentaro Hayashi <hayashi@clear-code.com>
1 parent f257c42 commit 64b48ac

File tree

12 files changed

+100
-85
lines changed

12 files changed

+100
-85
lines changed

‎.github/workflows/apt.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
fluent-package/apt/repositories
3838
fluent-apt-source/apt/repositories
3939
fluent-lts-apt-source/apt/repositories
40-
v6-test/fluent-package/apt/repositories
40+
v7-test/fluent-package/apt/repositories
4141
key: ${{ runner.os }}-cache-${{ matrix.rake-job }}-${{ hashFiles('**/config.rb', '**/Rakefile', '**/Gemfile*', 'fluent-package/templates/**', 'fluent-package/debian/**', 'fluent-package/apt/**/Dockerfile') }}
4242
- name: Install dependencies
4343
if: ${{ ! steps.cache-deb.outputs.cache-hit }}
@@ -53,25 +53,25 @@ jobs:
5353
- uses: actions/checkout@v4
5454
if: ${{ ! steps.cache-deb.outputs.cache-hit }}
5555
with:
56-
path: v6-test
57-
- name: Build v6 deb with Docker
56+
path: v7-test
57+
- name: Build v7 deb with Docker
5858
if: ${{ ! steps.cache-deb.outputs.cache-hit }}
5959
run: |
60-
cd v6-test
60+
cd v7-test
6161
git config user.email "fluentd@googlegroups.com"
6262
git config user.name "Fluentd developers"
63-
git am fluent-package/bump-version-v6.patch
63+
git am fluent-package/bump-version-v7.patch
6464
rake apt:build APT_TARGETS=${{ matrix.rake-job }}
6565
- name: Upload fluent-package deb
6666
uses: actions/upload-artifact@master
6767
with:
6868
name: packages-${{ matrix.rake-job }}
6969
path: fluent-package/apt/repositories
70-
- name: Upload v6 fluent-package deb
70+
- name: Upload v7 fluent-package deb
7171
uses: actions/upload-artifact@master
7272
with:
73-
name: v6-packages-${{ matrix.rake-job }}
74-
path: v6-test/fluent-package/apt/repositories
73+
name: v7-packages-${{ matrix.rake-job }}
74+
path: v7-test/fluent-package/apt/repositories
7575
- name: Upload fluent-apt-source deb
7676
uses: actions/upload-artifact@master
7777
with:
@@ -251,8 +251,8 @@ jobs:
251251
- "update-to-next-major-version.sh manual inactive"
252252
- "update-to-next-major-version.sh etc active"
253253
- "update-to-next-major-version.sh etc inactive"
254-
- "update-without-data-lost.sh v5 v6"
255-
- "update-without-data-lost.sh v6 v5"
254+
- "update-without-data-lost.sh v6 v7"
255+
- "update-without-data-lost.sh v7 v6"
256256
include:
257257
- label: Debian bookworm amd64
258258
rake-job: debian-bookworm
@@ -313,8 +313,8 @@ jobs:
313313
name: packages-${{ matrix.rake-job }}
314314
- uses: actions/download-artifact@v4
315315
with:
316-
name: v6-packages-${{ matrix.rake-job }}
317-
path: v6-test
316+
name: v7-packages-${{ matrix.rake-job }}
317+
path: v7-test
318318
- uses: actions/download-artifact@v4
319319
with:
320320
name: packages-apt-source-${{ matrix.rake-job }}

‎.github/workflows/yum.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
path: |
3737
fluent-package/yum/repositories
3838
fluent-release/yum/repositories
39-
v6-test/fluent-package/yum/repositories
39+
v7-test/fluent-package/yum/repositories
4040
key: ${{ runner.os }}-cache-${{ matrix.rake-job }}-${{ hashFiles('**/config.rb', '**/Rakefile', '**/Gemfile*', '**/*.spec.in', 'fluent-package/templates/**', 'fluent-package/yum/**/Dockerfile') }}
4141
- name: Install dependencies
4242
if: ${{ ! steps.cache-rpm.outputs.cache-hit }}
@@ -52,14 +52,14 @@ jobs:
5252
- uses: actions/checkout@v4
5353
if: ${{ ! steps.cache-rpm.outputs.cache-hit }}
5454
with:
55-
path: v6-test
56-
- name: Build v6 rpm with Docker
55+
path: v7-test
56+
- name: Build v7 rpm with Docker
5757
if: ${{ ! steps.cache-rpm.outputs.cache-hit }}
5858
run: |
59-
cd v6-test
59+
cd v7-test
6060
git config user.email "fluentd@googlegroups.com"
6161
git config user.name "Fluentd developers"
62-
git am fluent-package/bump-version-v6.patch
62+
git am fluent-package/bump-version-v7.patch
6363
rake yum:build YUM_TARGETS=${{ matrix.rake-job }}
6464
- name: Upload fluent-package rpm
6565
uses: actions/upload-artifact@v4
@@ -71,11 +71,11 @@ jobs:
7171
with:
7272
name: packages-release-${{ matrix.rake-job }}
7373
path: fluent-release/yum/repositories
74-
- name: Upload v6 fluent-package rpm
74+
- name: Upload v7 fluent-package rpm
7575
uses: actions/upload-artifact@v4
7676
with:
77-
name: v6-packages-${{ matrix.rake-job }}
78-
path: v6-test/fluent-package/yum/repositories
77+
name: v7-packages-${{ matrix.rake-job }}
78+
path: v7-test/fluent-package/yum/repositories
7979
check_package_size:
8080
name: Check Package Size
8181
runs-on: ubuntu-latest
@@ -227,8 +227,8 @@ jobs:
227227
# - "update-to-next-major-version.sh manual inactive"
228228
# - "update-to-next-major-version.sh etc active"
229229
# - "update-to-next-major-version.sh etc inactive"
230-
# - "update-without-data-lost.sh v5 v6"
231-
# - "update-without-data-lost.sh v6 v5"
230+
# - "update-without-data-lost.sh v6 v7"
231+
# - "update-without-data-lost.sh v7 v6"
232232
# include:
233233
# - label: AmazonLinux 2 x86_64
234234
# rake-job: amazonlinux-2
@@ -239,8 +239,8 @@ jobs:
239239
# name: packages-${{ matrix.rake-job }}
240240
# - uses: actions/download-artifact@v4
241241
# with:
242-
# name: v6-packages-${{ matrix.rake-job }}
243-
# path: v6-test
242+
# name: v7-packages-${{ matrix.rake-job }}
243+
# path: v7-test
244244
# - name: Show host runner information
245245
# run: |
246246
# cat /proc/cpuinfo | grep -E "vmx|svm"
@@ -298,8 +298,8 @@ jobs:
298298
- "update-to-next-major-version.sh manual inactive"
299299
- "update-to-next-major-version.sh etc active"
300300
- "update-to-next-major-version.sh etc inactive"
301-
- "update-without-data-lost.sh v5 v6"
302-
- "update-without-data-lost.sh v6 v5"
301+
- "update-without-data-lost.sh v6 v7"
302+
- "update-without-data-lost.sh v7 v6"
303303
include:
304304
- label: RockyLinux 8 x86_64
305305
rake-job: rockylinux-8
@@ -327,8 +327,8 @@ jobs:
327327
name: packages-release-${{ matrix.rake-job }}
328328
- uses: actions/download-artifact@v4
329329
with:
330-
name: v6-packages-${{ matrix.rake-job }}
331-
path: v6-test
330+
name: v7-packages-${{ matrix.rake-job }}
331+
path: v7-test
332332
- name: Install Incus
333333
run: |
334334
sudo apt-get update

‎fluent-package/apt/systemd-test/update-to-next-major-version.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ sudo /opt/fluent/bin/fluent-gem install --no-document gqtp
2424

2525
# Install next major version
2626
sudo apt install -V -y \
27-
/host/v6-test/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb 2>&1 | tee upgrade.log
27+
/host/v7-test/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb 2>&1 | tee upgrade.log
2828

2929
# Test: needrestart was suppressed
3030
test_suppressed_needrestart upgrade.log

‎fluent-package/apt/systemd-test/update-without-data-lost.sh‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,30 @@ set -exu
44

55
. $(dirname $0)/../commonvar.sh
66

7-
v5_package="/host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb"
8-
v6_package="/host/v6-test/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb"
7+
# TODO: v5_package
8+
v6_package="/host/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb"
9+
v7_package="/host/v7-test/${distribution}/pool/${code_name}/${channel}/*/*/fluent-package_*_${architecture}.deb"
910

1011
case "$1" in
11-
v5)
12-
package=$v5_package
13-
;;
1412
v6)
1513
package=$v6_package
1614
;;
15+
v7)
16+
package=$v7_package
17+
;;
1718
*)
1819
echo "Invalid argument: $1"
1920
exit 1
2021
;;
2122
esac
2223

2324
case "$2" in
24-
v5)
25-
next_package=$v5_package
26-
;;
2725
v6)
2826
next_package=$v6_package
2927
;;
28+
v7)
29+
next_package=$v7_package
30+
;;
3031
*)
3132
echo "Invalid argument: $2"
3233
exit 1

fluent-package/bump-version-v6.patch renamed to fluent-package/bump-version-v7.patch

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,92 @@
1-
From f6e245b9eae6f4f98a41125e623d0dd7ac2e535a Mon Sep 17 00:00:00 2001
2-
From: Kentaro Hayashi <hayashi@clear-code.com>
3-
Date: Mon, 9 Jun 2025 18:20:28 +0900
4-
Subject: [PATCH] Bump version to v6.0.0
1+
From 3b8ca4e15fbabd64ec595255b8e0610e8e9586bf Mon Sep 17 00:00:00 2001
2+
From: Shizuo Fujita <fujita@clear-code.com>
3+
Date: Mon, 14 Jul 2025 11:47:01 +0900
4+
Subject: [PATCH] Bump version to v7.0.0
55

6-
Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
6+
Signed-off-by: Shizuo Fujita <fujita@clear-code.com>
77
---
88
fluent-package/config.rb | 10 +++++-----
99
fluent-package/debian/changelog | 6 ++++++
1010
fluent-package/msi/Dockerfile | 2 +-
11-
fluent-package/yum/fluent-package.spec.in | 3 +++
12-
4 files changed, 15 insertions(+), 6 deletions(-)
11+
fluent-package/yum/fluent-package.spec.in | 5 ++++-
12+
4 files changed, 16 insertions(+), 7 deletions(-)
1313

1414
diff --git a/fluent-package/config.rb b/fluent-package/config.rb
15-
index 509f338..de767fd 100644
15+
index de767fd..b6d101d 100644
1616
--- a/fluent-package/config.rb
1717
+++ b/fluent-package/config.rb
1818
@@ -1,5 +1,5 @@
1919
PACKAGE_NAME = "fluent-package"
20-
-PACKAGE_VERSION = "5.2.0"
21-
+PACKAGE_VERSION = "6.0.0"
20+
-PACKAGE_VERSION = "6.0.0"
21+
+PACKAGE_VERSION = "7.0.0"
2222

2323
# Keep internal path (/opt/td-agent) for package name migration
2424
SERVICE_NAME = "fluentd"
25-
@@ -23,8 +23,8 @@ OPENSSL_FOR_MACOS_SHA256SUM = "6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d
25+
@@ -23,8 +23,8 @@
2626
BUNDLER_VERSION= "2.3.27"
2727

2828
# https://www.ruby-lang.org/en/downloads/ (tar.gz)
29-
-BUNDLED_RUBY_VERSION = "3.2.6"
30-
-BUNDLED_RUBY_SOURCE_SHA256SUM = "d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370"
31-
+BUNDLED_RUBY_VERSION = "3.4.4"
32-
+BUNDLED_RUBY_SOURCE_SHA256SUM = "a0597bfdf312e010efd1effaa8d7f1d7833146fdc17950caa8158ffa3dcbfa85"
29+
-BUNDLED_RUBY_VERSION = "3.4.4"
30+
-BUNDLED_RUBY_SOURCE_SHA256SUM = "a0597bfdf312e010efd1effaa8d7f1d7833146fdc17950caa8158ffa3dcbfa85"
31+
+BUNDLED_RUBY_VERSION = "3.3.8"
32+
+BUNDLED_RUBY_SOURCE_SHA256SUM = "5ae28a87a59a3e4ad66bc2931d232dbab953d0aa8f6baf3bc4f8f80977c89cab"
3333

3434
BUNDLED_RUBY_PATCHES = [
3535
# An example entry:
36-
@@ -32,8 +32,8 @@ BUNDLED_RUBY_PATCHES = [
36+
@@ -32,8 +32,8 @@
3737
]
3838

3939
# https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES)
40-
-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.2.6-1"
41-
-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "549616f2964301616fd713e5590f024b63b28d6cc5e5033c87eff32e0d1fa2d2"
42-
+BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.4-2"
43-
+BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "29fe655a8bee91d6466e631ae612142a1c5d68d46323ccca7f35add2dbb28b51"
40+
-BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.4-2"
41+
-BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "29fe655a8bee91d6466e631ae612142a1c5d68d46323ccca7f35add2dbb28b51"
42+
+BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.3.8-1"
43+
+BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "2aa7d8fa7bc527b7373b91c75fae9549f5926fa918ba808b8744c1f0d8ad9f52"
4444

4545
# Files under rubyinstaller/ are patches for RubyInstaller's binary package.
4646
# Other patches for Ruby's source tree which can be shared with BUNDLED_RUBY_PATCHES.
4747
diff --git a/fluent-package/debian/changelog b/fluent-package/debian/changelog
48-
index 0a73dbb..2614fac 100644
48+
index 2614fac..95eb903 100644
4949
--- a/fluent-package/debian/changelog
5050
+++ b/fluent-package/debian/changelog
5151
@@ -1,3 +1,9 @@
52-
+fluent-package (6.0.0-1) unstable; urgency=low
52+
+fluent-package (7.0.0-1) unstable; urgency=low
5353
+
5454
+ * New upstream release.
5555
+
56-
+ -- Kentaro Hayashi <hayashi@clear-code.com> Fri, 29 Aug 2025 13:55:06 -0000
56+
+ -- Shizuo Fujita <fujita@clear-code.com> Sun, 29 Aug 2027 13:55:06 -0000
5757
+
58-
fluent-package (5.2.0-1) unstable; urgency=low
58+
fluent-package (6.0.0-1) unstable; urgency=low
5959

6060
* New upstream release.
6161
diff --git a/fluent-package/msi/Dockerfile b/fluent-package/msi/Dockerfile
62-
index f140c34..a064784 100644
62+
index a064784..99c36c6 100644
6363
--- a/fluent-package/msi/Dockerfile
6464
+++ b/fluent-package/msi/Dockerfile
6565
@@ -32,7 +32,7 @@ RUN \
6666
# Required CMake 3.x to build cmetrics gem
6767
choco install -y cmake --version=3.31.6 --installargs 'ADD_CMAKE_TO_PATH=System' && \
6868
choco install -y msys2 --params /NoUpdate --version=20250221.0.0 && \
69-
- choco install ruby -y --version=3.2.8.1 && \
70-
+ choco install ruby -y --version=3.4.4.2 && \
69+
- choco install ruby -y --version=3.4.4.2 && \
70+
+ choco install ruby -y --version=3.3.8.1 && \
7171
refreshenv && \
7272
ridk install 3 && \
7373
gem install --no-document --force bundler builder
7474
diff --git a/fluent-package/yum/fluent-package.spec.in b/fluent-package/yum/fluent-package.spec.in
75-
index 45f0519..240f30c 100644
75+
index 34f0060..eb970f0 100644
7676
--- a/fluent-package/yum/fluent-package.spec.in
7777
+++ b/fluent-package/yum/fluent-package.spec.in
78-
@@ -439,6 +439,9 @@ fi
78+
@@ -437,7 +437,10 @@ fi
7979
# NOTE: %{_tmpfilesdir} is available since CentOS 7
8080
%attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@
8181
%changelog
82-
+* Fri Aug 29 2025 Kentaro Hayashi <hayashi@clear-code.com> - 6.0.0-1
82+
-* Fri Aug 29 2025 Kentaro Hayashi <hayashi@clear-code.com> - 6.0.0-1
83+
+* Sun Aug 29 2027 Shizuo Fujita <fujita@clear-code.com> - 6.0.0-1
8384
+- New upstream release.
8485
+
85-
* Sat Dec 14 2024 Kentaro Hayashi <hayashi@clear-code.com> - 5.2.0-1
86+
+* Tue Aug 29 2025 Kentaro Hayashi <hayashi@clear-code.com> - 6.0.0-1
8687
- New upstream release.
8788

89+
* Sat Dec 14 2024 Kentaro Hayashi <hayashi@clear-code.com> - 5.2.0-1
8890
--
89-
2.49.0
91+
2.50.1
9092

‎fluent-package/config.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PACKAGE_NAME = "fluent-package"
2-
PACKAGE_VERSION = "5.2.0"
2+
PACKAGE_VERSION = "6.0.0"
33

44
# Keep internal path (/opt/td-agent) for package name migration
55
SERVICE_NAME = "fluentd"
@@ -23,17 +23,17 @@
2323
BUNDLER_VERSION= "2.3.27"
2424

2525
# https://www.ruby-lang.org/en/downloads/ (tar.gz)
26-
BUNDLED_RUBY_VERSION = "3.2.6"
27-
BUNDLED_RUBY_SOURCE_SHA256SUM = "d9cb65ecdf3f18669639f2638b63379ed6fbb17d93ae4e726d4eb2bf68a48370"
26+
BUNDLED_RUBY_VERSION = "3.4.4"
27+
BUNDLED_RUBY_SOURCE_SHA256SUM = "a0597bfdf312e010efd1effaa8d7f1d7833146fdc17950caa8158ffa3dcbfa85"
2828

2929
BUNDLED_RUBY_PATCHES = [
3030
# An example entry:
3131
# ["ruby-3.0/0001-ruby-resolv-Fix-confusion-of-received-response-messa.patch", ["= 3.0.1"]],
3232
]
3333

3434
# https://rubyinstaller.org/downloads/ (7-ZIP ARCHIVES)
35-
BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.2.6-1"
36-
BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "549616f2964301616fd713e5590f024b63b28d6cc5e5033c87eff32e0d1fa2d2"
35+
BUNDLED_RUBY_INSTALLER_X64_VERSION = "3.4.4-2"
36+
BUNDLED_RUBY_INSTALLER_X64_SHA256SUM = "29fe655a8bee91d6466e631ae612142a1c5d68d46323ccca7f35add2dbb28b51"
3737

3838
# Files under rubyinstaller/ are patches for RubyInstaller's binary package.
3939
# Other patches for Ruby's source tree which can be shared with BUNDLED_RUBY_PATCHES.

‎fluent-package/debian/changelog‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
fluent-package (6.0.0-1) unstable; urgency=low
2+
3+
* New upstream release.
4+
5+
-- Kentaro Hayashi <hayashi@clear-code.com> Fri, 29 Aug 2025 13:55:06 -0000
6+
17
fluent-package (5.2.0-1) unstable; urgency=low
28

39
* New upstream release.

‎fluent-package/msi/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN \
3232
# Required CMake 3.x to build cmetrics gem
3333
choco install -y cmake --version=3.31.6 --installargs 'ADD_CMAKE_TO_PATH=System' && \
3434
choco install -y msys2 --params /NoUpdate --version=20250221.0.0 && \
35-
choco install ruby -y --version=3.2.8.1 && \
35+
choco install ruby -y --version=3.4.4.2 && \
3636
refreshenv && \
3737
ridk install 3 && \
3838
gem install --no-document --force bundler builder

‎fluent-package/yum/fluent-package.spec.in‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,9 @@ fi
437437
# NOTE: %{_tmpfilesdir} is available since CentOS 7
438438
%attr(0755,fluentd,fluentd) %dir /tmp/@PACKAGE_DIR@
439439
%changelog
440+
* Fri Aug 29 2025 Kentaro Hayashi <hayashi@clear-code.com> - 6.0.0-1
441+
- New upstream release.
442+
440443
* Sat Dec 14 2024 Kentaro Hayashi <hayashi@clear-code.com> - 5.2.0-1
441444
- New upstream release.
442445

‎fluent-package/yum/systemd-test/update-from-v5-lts.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ sudo $DNF install -y \
3434
# Test: take over enabled state
3535
systemctl is-enabled fluentd
3636

37+
# It might take some time to restart
38+
sleep 3
39+
3740
# Test: service status
3841
systemctl status --no-pager fluentd
3942
systemctl status --no-pager td-agent

0 commit comments

Comments
 (0)