Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Commit e8a9669

Browse files
authored
Merge pull request #303 from nightpool/update_osx_builds
Update mac OS build configuration
2 parents 2d5250a + 07705ed commit e8a9669

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ matrix:
1111
osx_image: xcode12
1212
- os: osx
1313
osx_image: xcode11.3
14-
- os: osx
15-
osx_image: xcode10.1
1614
addons:
1715
apt:
1816
packages:
@@ -39,7 +37,8 @@ deploy:
3937
skip_cleanup: true
4038
on:
4139
tags: true
42-
rvm: '2.7' # Only deploy 1 of each platform
40+
rvm: '2.7'
41+
osx_image: xcode12
4342
cache:
4443
bundler: true
4544
notifications:

Rakefile

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,19 +105,21 @@ end
105105
task :default => [:compile, :spec]
106106
task :build => [:clean]
107107

108-
desc 'Generate OSX varient platform names. Requires `compile` to already have been run.'
108+
desc 'Generate OSX platform builds. Although any v8 OSX compile will run on any Mac OS version down to 10.10, RubyGems requires us to submit all of the different platforms seperately. Requires `compile` to already have been run, but is seperate for Travis reasons.'
109109
task :osx_varients do
110110
gemspec = Helpers.binary_gemspec
111-
next unless gemspec.platform.os == 'osx'
111+
next unless Gem::Platform.local.os == 'darwin'
112112

113-
%w(x86_64 universal).each do |cpu|
114-
platform = gemspec.platform.dup
115-
next unless platform.cpu != cpu
113+
[15, 16, 17, 18, 19].each do |version|
114+
%w(x86_64 universal).each do |cpu|
116115

117-
platform.cpu = cpu
118-
gemspec.platform = platform
116+
gemspec.platform = Gem::Platform.local.tap do |platform|
117+
platform.cpu = cpu
118+
platform.version = version
119+
end
119120

120-
package = Gem::Package.build gemspec
121-
FileUtils.mv package, 'pkg'
121+
package = Gem::Package.build gemspec
122+
FileUtils.mv package, 'pkg'
123+
end
122124
end
123125
end

0 commit comments

Comments
 (0)