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

Jump to bottom

Bolt windows ed25519 support #844

Merged
merged 2 commits into from
May 8, 2024
Merged

Bolt windows ed25519 support #844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fbab01
(fix) building gems on windows x86
h0tw1r3 May 7, 2024
38f3e8b
(gh-bolt-3248) enable ed25519 support on windows
h0tw1r3 May 7, 2024
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
6 changes: 5 additions & 1 deletion configs/components/ruby-2.7.8.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,11 @@
elsif platform.is_macos? && platform.architecture == 'arm64' && platform.os_version.to_i >= 13
rbconfig_changes["CC"] = 'clang'
elsif platform.is_windows?
rbconfig_changes["CC"] = "x86_64-w64-mingw32-gcc"
if platform.architecture == "x64"
rbconfig_changes["CC"] = "x86_64-w64-mingw32-gcc"
else
rbconfig_changes["CC"] = "i686-w64-mingw32-gcc"
end
end

pkg.add_source("file://resources/files/ruby_vendor_gems/operating_system.rb")
Expand Down
8 changes: 2 additions & 6 deletions configs/projects/bolt-runtime.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,8 @@
proj.component "puppet-ca-bundle"
proj.component "ruby-#{proj.ruby_version}"

# Building native gems on Windows has some issues right now.
# Include for non-Windows platforms only.
unless platform.is_windows?
proj.component 'rubygem-bcrypt_pbkdf'
proj.component 'rubygem-ed25519'
end
proj.component 'rubygem-bcrypt_pbkdf'
proj.component 'rubygem-ed25519'

# Puppet dependencies
proj.component 'rubygem-hocon'
Expand Down
Loading