Skip to content

Commit aff6172

Browse files
committed
(maint) Relax win32-dir
Allow bundler to install win32-dir 0.7.2 that contains the ASLR fix. This change affects bundler and the runtime dependencies for the win32 specific versions of the puppet gem. It is important to continue accepting win32-dir 0.4.9, because that is what we ship in the puppet-runtime. Since win32-dir 0.7.2 only supports ruby 2.4 and up, this change drops the ruby 2.3 and windows rspec combination. Ruby 2.3 went EOL March 28, 2018. The change to ruby-prof was due to bundler pulling in a a version that wasn't compatible with older ruby versions. So restrict that to ruby >= 2.5. It's only needed when running the memory related benchmarks.
1 parent a5411f2 commit aff6172

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

.github/workflows/rspec_tests.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
- {os: ubuntu-18.04, ruby: 2.6}
2020
- {os: ubuntu-18.04, ruby: 2.7}
2121
- {os: ubuntu-18.04, ruby: jruby-9.2.9.0}
22-
- {os: windows-2016, ruby: 2.3}
2322
- {os: windows-2016, ruby: 2.4}
2423
- {os: windows-2016, ruby: 2.5}
2524
- {os: windows-2016, ruby: 2.6}

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ group(:development, optional: true) do
5656
gem 'memory_profiler', require: false, platforms: [:mri]
5757
gem 'pry', require: false, platforms: [:ruby]
5858
gem "racc", "1.4.9", require: false, platforms: [:ruby]
59-
if RUBY_PLATFORM != 'java'
59+
if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.5
6060
gem 'ruby-prof', '>= 0.16.0', require: false
6161
end
6262
end

ext/project_data.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ gem_platform_dependencies:
4141
gem_runtime_dependencies:
4242
ffi: ['> 1.9.24', '< 2']
4343
# win32-xxxx gems are pinned due to PUP-6445
44-
win32-dir: '= 0.4.9'
44+
win32-dir: ['>= 0.4.9', '<= 0.7.2']
4545
win32-process: '= 0.7.5'
4646
# Use of win32-security is deprecated
4747
win32-security: '= 0.2.5'
@@ -51,7 +51,7 @@ gem_platform_dependencies:
5151
gem_runtime_dependencies:
5252
ffi: ['> 1.9.24', '< 2']
5353
# win32-xxxx gems are pinned due to PUP-6445
54-
win32-dir: '= 0.4.9'
54+
win32-dir: ['>= 0.4.9', '<= 0.7.2']
5555
win32-process: '= 0.7.5'
5656
# Use of win32-security is deprecated
5757
win32-security: '= 0.2.5'

0 commit comments

Comments
 (0)