Skip to content

Commit

Permalink
convert to using windows-ruby-dev-tools-release
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
flavorjones committed Sep 25, 2017
1 parent a2f4c4b commit 4fef7ad
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 36 deletions.
34 changes: 4 additions & 30 deletions concourse/mini_portile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ groups:
- name: master
jobs:
- ruby-<%= ruby_version %>
- windows-install-ruby-2.3
- ruby-2.3-devkit
- win-ruby-<%= ruby_version %>-devkit

- name: PRs
jobs:
Expand All @@ -27,13 +26,6 @@ resources:
branch: master
disable_ci_skip: true # always get the latest pipeline configuration

- name: nokogiri-ci
type: git
source:
uri: https://github.com/sparklemotion/nokogiri/
branch: master
disable_ci_skip: true # always get the latest pipeline configuration

- name: mini_portile
type: git
source:
Expand Down Expand Up @@ -72,38 +64,20 @@ jobs:
run:
path: ci/concourse/tasks/rake-test/task.sh

- name: windows-install-ruby-2.3
public: true
serial_groups: [windows-configuration]
plan:
- get: nokogiri-ci
- get: mini_portile
trigger: true
- task: setup
config:
platform: windows
inputs:
- name: nokogiri-ci
path: ci
run:
path: powershell
args: ["-File", "ci/concourse/tasks/windows-config/install-ruby-and-devkit.ps1"]

- name: ruby-2.3-devkit
- name: win-ruby-<%= ruby_version %>-devkit
public: true
plan:
- get: ci
- get: nokogiri-ci
- get: mini_portile
trigger: true
passed: ["windows-install-ruby-2.3"]
- task: rake-test
config:
platform: windows
inputs:
- name: ci
- name: nokogiri-ci
- name: mini_portile
params:
WIN_RUBY_VERSION: "<%= ruby_version %>"
run:
path: powershell
args: ["-File", "ci/concourse/tasks/rake-test/task.ps1"]
Expand Down
8 changes: 3 additions & 5 deletions concourse/tasks/rake-test/task.ps1
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
. "nokogiri-ci\concourse\shared\common.ps1"
. "c:\var\vcap\packages\windows-ruby-dev-tools\prelude.ps1"

prepend-path $ruby23_bin_path
$env:RUBYOPT = "-rdevkit"

push-location mini_portile

stream-cmd "gem" "install bundler"
stream-cmd "bundle" "install"
stream-cmd "bundle" "exec rake test"
system-cmd "gem install bundler"
system-cmd "bundle install"
system-cmd "bundle exec rake test"

pop-location
2 changes: 1 addition & 1 deletion mini_portile2.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "minitest", "~> 5.8"
spec.add_development_dependency "minitest-hooks", "~> 1.4"
spec.add_development_dependency "minitar", "~> 0.5"
spec.add_development_dependency "concourse", "~> 0.12"
spec.add_development_dependency "concourse", "~> 0.16"

spec.required_ruby_version = ">= 1.9.2"
end

0 comments on commit 4fef7ad

Please sign in to comment.