Skip to content

Commit

Permalink
Merge branch 'flavorjones-ci-test-alpine'
Browse files Browse the repository at this point in the history
  • Loading branch information
flavorjones committed Mar 30, 2020
2 parents ace3340 + ec23cf0 commit cf59c9d
Show file tree
Hide file tree
Showing 13 changed files with 839 additions and 1,181 deletions.
10 changes: 2 additions & 8 deletions Rakefile
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
# -*- ruby -*-
require 'rubygems'
ENV['LANG'] = "en_US.UTF-8" # UBUNTU 10.04, Y U NO DEFAULT TO UTF-8?

gem 'hoe'
require 'hoe'

require 'shellwords'
require "rake_compiler_dock"

Hoe.plugin :debugging
Hoe.plugin :git
Hoe.plugin :gemspec
Hoe.plugin :bundler

ENV['LANG'] = "en_US.UTF-8" # UBUNTU 10.04, Y U NO DEFAULT TO UTF-8?
require 'shellwords'

require_relative "tasks/util"
require_relative "tasks/cross-ruby"
Expand Down Expand Up @@ -80,8 +76,6 @@ HOE = Hoe.spec 'nokogiri' do
self.test_prelude = 'require "helper"' # ensure simplecov gets loaded before anything else
end

# ----------------------------------------

if java?
# TODO: clean this section up.
require "rake/javaextensiontask"
Expand Down
3 changes: 3 additions & 0 deletions concourse/common_prelude.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@
"suppressions/**",
".github/**",
].to_json

cross_rubies_path = File.join(File.dirname(__FILE__), "..", ".cross_rubies")
$native_ruby_versions = File.read(cross_rubies_path).split("\n").map { |line| line.split(":").first.split(".").take(2).join(".") }.uniq.sort
13 changes: 13 additions & 0 deletions concourse/images/Dockerfile.alpine.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM ruby:alpine

# prelude
RUN apk update
RUN apk add bash build-base

# valgrind
RUN apk add valgrind

# libxml-et-al
RUN apk add libxml2-dev libxslt-dev pkgconfig

<%= File.read "bundle-install.step" %>

0 comments on commit cf59c9d

Please sign in to comment.