Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: use the last supported version on each distribution to fix failure #614

Merged
merged 1 commit into from
Feb 7, 2024
Merged

ci: use the last supported version on each distribution to fix failure #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions fluent-package/apt/ubuntu-focal/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ RUN \
apt clean && \
# raise IPv4 priority
sed -i'' -e 's,#precedence ::ffff:0:0/96 100,precedence ::ffff:0:0/96 100,' /etc/gai.conf && \
# enable multiplatform feature
gem install --no-document --install-dir /usr/share/rubygems-integration/all bundler builder && \
# enable multiplatform feature (bundler 2.4.22 is the latest version which supports ruby 2.6)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Ubuntu focal's ruby is ruby 2.7

gem install --no-document --install-dir /usr/share/rubygems-integration/all bundler:2.4.22 builder && \
rm -rf /var/lib/apt/lists/* && \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
4 changes: 2 additions & 2 deletions fluent-package/yum/amazonlinux-2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN \
amazon-linux-extras install ruby2.6 && \
# raise IPv4 priority
echo "precedence ::ffff:0:0/96 100" > /etc/gai.conf && \
# enable multiplatform feature
gem install --no-document bundler builder && \
# enable multiplatform feature (bundler 2.4.22 is the latest version which supports ruby 2.6)
gem install --no-document bundler:2.4.22 builder && \
yum clean ${quiet} all && \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
4 changes: 2 additions & 2 deletions fluent-package/yum/centos-7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ RUN \
cmake3 && \
# raise IPv4 priority
echo "precedence ::ffff:0:0/96 100" > /etc/gai.conf && \
# enable multiplatform feature
source /opt/rh/rh-ruby26/enable && gem install --no-document --install-dir /opt/rh/rh-ruby26/root/usr/share/gems bundler builder && \
# enable multiplatform feature (bundler 2.4.22 is the latest version which supports ruby 2.6)
source /opt/rh/rh-ruby26/enable && gem install --no-document --install-dir /opt/rh/rh-ruby26/root/usr/share/gems bundler:2.4.22 builder && \
scl enable devtoolset-11 bash && \
yum clean ${quiet} all && \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y