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

native gems are built with ExtensionTask.no_native=true #2125

Merged
merged 5 commits into from
Dec 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
81 changes: 41 additions & 40 deletions .hoerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,46 @@
---
# this regex is what `rake check_manifest` should consider excluded from the gem
exclude: !ruby/regexp '/
(^\.\/
((\.git
|.vagrant
|.yardoc
|concourse
|gems
|ports
|suppressions
|rakelib
|test
|tmp
)\/)
|\.(autotest
|cross_rubies
|editorconfig
|gemtest
|github
|gitignore
|hoerc
|travis\.yml
)
|Gemfile.*
|Manifest.txt
|Rakefile
|appveyor\.yml
|CHANGELOG.md
|CODE_OF_CONDUCT.md
|CONTRIBUTING.md
|ROADMAP.md
|SECURITY.md
|STANDARD_RESPONSES.md
|Vagrantfile
|Y_U_NO_GEMSPEC.md
|C_CODING_STYLE.*
|h1-.*
|[0-9][0-9][0-9][0-9]-.*
|scripts
|sorbet
|patches
(^\.\/(\.git|
\.github|
\.vagrant|
\.yardoc|
concourse|
gems|
patches|
ports|
pkg|
suppressions|
rakelib|
scripts|
sorbet|
test|
tmp
)\/
| (\.autotest|
\.cross_rubies|
\.editorconfig|
\.gemtest|
\.gitignore|
\.hoerc|
\.travis\.yml|
appveyor\.yml|
CHANGELOG\.md|
CODE_OF_CONDUCT\.md|
CONTRIBUTING\.md|
C_CODING_STYLE\.rdoc|
Gemfile.*|
Manifest\.txt|
ROADMAP\.md|
Rakefile|
SECURITY\.md|
STANDARD_RESPONSES\.md|
Vagrantfile|
Y_U_NO_GEMSPEC\.md|
[0-9]+-.*|
[a-z\.]+\.(log|out)
)$
)
|\.gitkeep
|
(.*\/nokogiri\.(so|bundle))$
/x'
2 changes: 2 additions & 0 deletions Manifest.txt
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ lib/nokogiri/html/sax/push_parser.rb
lib/nokogiri/jruby/dependencies.rb
lib/nokogiri/syntax_error.rb
lib/nokogiri/version.rb
lib/nokogiri/version/constant.rb
lib/nokogiri/version/info.rb
lib/nokogiri/xml.rb
lib/nokogiri/xml/attr.rb
lib/nokogiri/xml/attribute_decl.rb
Expand Down
3 changes: 3 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ Hoe.plugin :git
Hoe.plugin :markdown

require_relative "rakelib/util"
require_relative "lib/nokogiri/version/constant"

HOE = Hoe.spec "nokogiri" do |hoe|
hoe.version = Nokogiri::VERSION

hoe.author = [
"Mike Dalessio",
"Aaron Patterson",
Expand Down
8 changes: 1 addition & 7 deletions concourse/tasks/gem-test/gem-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,7 @@ bundle install --local || bundle install
bundle exec rake set-version-to-timestamp

if [ -n "${BUILD_NATIVE_GEM:-}" ] ; then
# TODO remove after https://github.com/rake-compiler/rake-compiler/pull/171 is shipped
find /usr/local/rvm/gems -name extensiontask.rb | while read f ; do
echo "rewriting $f"
sudo sed -i 's/callback.call(spec) if callback/@cross_compiling.call(spec) if @cross_compiling/' $f
done

bundle exec rake gem:x86_64-linux:guest
bundle exec rake gem:x86_64-linux:builder FORCE_CROSS_COMPILING=true
else
# TODO we're only compiling so that we retrieve libxml2/libxslt
# tarballs, we can do better a couple of different ways
Expand Down