Skip to content

Commit 4b8a87d

Browse files
Merge pull request #7446 from rubygems/deivid-rodriguez/windows-33
Add missing Windows job to CI (cherry picked from commit e30bbe6)
1 parent 975e5f9 commit 4b8a87d

File tree

4 files changed

+1
-7
lines changed

4 files changed

+1
-7
lines changed

.github/workflows/bundler.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.0, value: 3.0.6 }, timeout: 150 }
4848
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.1, value: 3.1.4 }, timeout: 150 }
4949
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.2, value: 3.2.3 }, timeout: 150 }
50+
- { os: { name: Windows, value: windows-2022 }, bundler: { name: 2, value: '' }, ruby: { name: ruby-3.3, value: 3.3.0 }, timeout: 150 }
5051

5152
env:
5253
RGV: ..

bundler/spec/install/gemfile/git_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1279,7 +1279,6 @@
12791279
s.extensions = ["ext/extconf.rb"]
12801280
s.write "ext/extconf.rb", <<-RUBY
12811281
require "mkmf"
1282-
$extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
12831282
create_makefile("foo")
12841283
RUBY
12851284
s.write "ext/foo.c", "void Init_foo() {}"

bundler/spec/install/gems/native_extensions_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
s.extensions = ["ext/extconf.rb"]
88
s.write "ext/extconf.rb", <<-E
99
require "mkmf"
10-
$extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
1110
name = "c_extension_bundle"
1211
dir_config(name)
1312
raise "OMG" unless with_config("c_extension") == "hello"
@@ -52,7 +51,6 @@
5251
s.extensions = ["ext/extconf.rb"]
5352
s.write "ext/extconf.rb", <<-E
5453
require "mkmf"
55-
$extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
5654
name = "c_extension_bundle"
5755
dir_config(name)
5856
raise "OMG" unless with_config("c_extension") == "hello"
@@ -97,7 +95,6 @@
9795
s.extensions = ["ext/extconf.rb"]
9896
s.write "ext/extconf.rb", <<-E
9997
require "mkmf"
100-
$extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
10198
name = "c_extension_bundle_#{n}"
10299
dir_config(name)
103100
raise "OMG" unless with_config("c_extension_#{n}") == "#{n}"
@@ -150,7 +147,6 @@
150147
s.extensions = ["ext/extconf.rb"]
151148
s.write "ext/extconf.rb", <<-E
152149
require "mkmf"
153-
$extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
154150
name = "c_extension_bundle"
155151
dir_config(name)
156152
raise "OMG" unless with_config("c_extension") == "hello" && with_config("c_extension_bundle-dir") == "hola"

bundler/spec/support/builders.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,6 @@ def add_c_extension
494494
write "ext/extconf.rb", <<-RUBY
495495
require "mkmf"
496496
497-
$extout = "$(topdir)/" + RbConfig::CONFIG["EXTOUT"]
498-
499497
extension_name = "#{name}_c"
500498
if extra_lib_dir = with_config("ext-lib")
501499
# add extra libpath if --with-ext-lib is

0 commit comments

Comments
 (0)