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.

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

Fix cleanup path for windows container #382

Merged
merged 2 commits into from
Jun 4, 2024
Merged

Conversation

kenhys
Copy link
Contributor

@kenhys kenhys commented Jun 4, 2024

As newer Ruby 3.2 was installed into C:\ruby32 for v1.17 branch,
the path of cleanup cache also fixed.

As newer Ruby 3.2 was installed into C:\ruby32,
the path of cleanup cache also fixed.

Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
Signed-off-by: Kentaro Hayashi <hayashi@clear-code.com>
@kenhys kenhys changed the title Fix cleanup Fix cleanup path for windows container Jun 4, 2024
@kenhys kenhys requested a review from daipom June 4, 2024 02:57
@kenhys
Copy link
Contributor Author

kenhys commented Jun 4, 2024

It's careless...

@kenhys
Copy link
Contributor Author

kenhys commented Jun 4, 2024

Follow-up of #381.

Copy link

@daipom daipom left a comment

Choose a reason for hiding this comment

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

Sorry, I don't understand how to manage these Dockerfiles.
The files that should be updated are only the v1.17 ones, right?
Is it OK to update Dockerfile.template.erb in this way?
How can we keep an older version files?

@kenhys
Copy link
Contributor Author

kenhys commented Jun 4, 2024

Currently there was no plan to maintain multiple branches.

But as you pointed out, it may be better to keep v1.16 branch, at least for LTS.

I've created v1.16 branch for it.

@kenhys
Copy link
Contributor Author

kenhys commented Jun 4, 2024

  • main = v1.17 (this PR)
  • v1.16 = for future release

Copy link

@daipom daipom left a comment

Choose a reason for hiding this comment

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

I see! Thanks!

Note for me: Currently, the Makefile targets v1.17 only.

@kenhys kenhys merged commit 5986d6b into fluent:master Jun 4, 2024
4 checks passed
@kenhys kenhys deleted the fix-cleanup branch June 4, 2024 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants