Skip to content

Commit

Permalink
Remove "allow fail" group and the paused windows tasks
Browse files Browse the repository at this point in the history
These are easy enough to add back once we fix windows builds in #1729,
and removing them makes the upcoming refactor easier to see.

part of #1864
  • Loading branch information
flavorjones committed Jan 25, 2019
1 parent f3d6a31 commit 510b688
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 184 deletions.
58 changes: 0 additions & 58 deletions concourse/nokogiri.yml
Original file line number Diff line number Diff line change
@@ -1,38 +1,3 @@
groups:
- name: master
jobs:
<% Concourse.production_rubies.each do |ruby_version| %>
- "ruby-<%= ruby_version %>-system"
- "ruby-<%= ruby_version %>-vendored"
- "ruby-<%= ruby_version %>-valgrind"
<% end %>
- "ruby-vanilla-system"
<% Concourse.production_rubies.last(1).each do |ruby_version| %>
- "ruby-libxmlruby-system"
- "ruby-libxmlruby-vendored"
- "ruby-libxmlruby-valgrind"
<% end %>
<% for jruby_version in RUBIES[:jruby] %>
- "jruby-<%= jruby_version %>"
<% end %>
<% RUBIES[:windows].first(1).each do |ruby_version| %>
- "win-ruby-<%= ruby_version %>-devkit"
<% end %>
- build-success
- gem-test
- gem-test-java

- name: allow-failure
jobs:
<% RUBIES[:windows][1..-1].each do |ruby_version| %>
- "win-ruby-<%= ruby_version %>-devkit"
<% end %>
<% Concourse.rc_rubies.each do |ruby_version| %>
- "ruby-<%= ruby_version %>-system"
- "ruby-<%= ruby_version %>-vendored"
- "ruby-<%= ruby_version %>-valgrind"
<% end %>

resource_types:
- name: irc-notification
type: docker-image
Expand Down Expand Up @@ -253,26 +218,6 @@ jobs:
on_failure: *notify_failure_to_irc
<% end %>

<% for ruby_version in RUBIES[:windows] %>
- name: win-ruby-<%= ruby_version %>-devkit
public: true
plan:
- get: ci
- get: nokogiri
trigger: true
- task: rake-test
config:
platform: windows
inputs:
- name: ci
- name: nokogiri
params:
WIN_RUBY_VERSION: "<%= ruby_version %>"
run:
path: powershell
args: ["-File", "ci/concourse/tasks/rake-test/run.ps1"]
<% end %>

- name: build-success
public: true
disable_manual_trigger: true
Expand All @@ -290,9 +235,6 @@ jobs:
<% for jruby_version in RUBIES[:jruby] %>
- "jruby-<%= jruby_version %>"
<% end %>
# <% RUBIES[:windows].first(1).each do |ruby_version| %>
# - "win-ruby-<%= ruby_version %>-devkit"
# <% end %>
- put: nokogiri-irc
params: {message: "($BUILD_PIPELINE_NAME/$BUILD_JOB_NAME) The build passed ($BUILD_URL)"}

Expand Down
126 changes: 0 additions & 126 deletions concourse/nokogiri.yml.generated
Original file line number Diff line number Diff line change
@@ -1,52 +1,3 @@
groups:
- name: master
jobs:

- "ruby-2.3-system"
- "ruby-2.3-vendored"
- "ruby-2.3-valgrind"

- "ruby-2.4-system"
- "ruby-2.4-vendored"
- "ruby-2.4-valgrind"

- "ruby-2.5-system"
- "ruby-2.5-vendored"
- "ruby-2.5-valgrind"

- "ruby-2.6-system"
- "ruby-2.6-vendored"
- "ruby-2.6-valgrind"

- "ruby-vanilla-system"

- "ruby-libxmlruby-system"
- "ruby-libxmlruby-vendored"
- "ruby-libxmlruby-valgrind"


- "jruby-9.1"

- "jruby-9.2"


- "win-ruby-2.3-devkit"

- build-success
- gem-test
- gem-test-java

- name: allow-failure
jobs:

- "win-ruby-2.4-devkit"

- "win-ruby-2.5-devkit"

- "win-ruby-2.6-devkit"



resource_types:
- name: irc-notification
type: docker-image
Expand Down Expand Up @@ -468,80 +419,6 @@ jobs:
on_failure: *notify_failure_to_irc



- name: win-ruby-2.3-devkit
public: true
plan:
- get: ci
- get: nokogiri
trigger: true
- task: rake-test
config:
platform: windows
inputs:
- name: ci
- name: nokogiri
params:
WIN_RUBY_VERSION: "2.3"
run:
path: powershell
args: ["-File", "ci/concourse/tasks/rake-test/run.ps1"]

- name: win-ruby-2.4-devkit
public: true
plan:
- get: ci
- get: nokogiri
trigger: true
- task: rake-test
config:
platform: windows
inputs:
- name: ci
- name: nokogiri
params:
WIN_RUBY_VERSION: "2.4"
run:
path: powershell
args: ["-File", "ci/concourse/tasks/rake-test/run.ps1"]

- name: win-ruby-2.5-devkit
public: true
plan:
- get: ci
- get: nokogiri
trigger: true
- task: rake-test
config:
platform: windows
inputs:
- name: ci
- name: nokogiri
params:
WIN_RUBY_VERSION: "2.5"
run:
path: powershell
args: ["-File", "ci/concourse/tasks/rake-test/run.ps1"]

- name: win-ruby-2.6-devkit
public: true
plan:
- get: ci
- get: nokogiri
trigger: true
- task: rake-test
config:
platform: windows
inputs:
- name: ci
- name: nokogiri
params:
WIN_RUBY_VERSION: "2.6"
run:
path: powershell
args: ["-File", "ci/concourse/tasks/rake-test/run.ps1"]


- name: build-success
public: true
disable_manual_trigger: true
Expand All @@ -567,9 +444,6 @@ jobs:

- "jruby-9.2"

#
# - "win-ruby-2.3-devkit"
#
- put: nokogiri-irc
params: {message: "($BUILD_PIPELINE_NAME/$BUILD_JOB_NAME) The build passed ($BUILD_URL)"}

Expand Down

0 comments on commit 510b688

Please sign in to comment.