Merge branch 'master' into huge-junits-2

Author: toolmantim

.buildkite/pipeline.yml

@@ -1,11 +1,11 @@
 steps:
   - label: ":bash: Plugin"
     plugins:
-      docker-compose#v2.6.0:
+      docker-compose#v3.0.1:
         run: plugin
   - label: ":ruby: Ruby"
     plugins:
-      docker-compose#v2.6.0:
+      docker-compose#v3.0.1:
         run: ruby
   - label: "✨ Lint"
     plugins:

README.md

@@ -14,7 +14,7 @@ steps:
   - wait: ~
     continue_on_failure: true
   - plugins:
-      - junit-annotate#v1.5.1:
+      - junit-annotate#v1.6.0:
           artifacts: tmp/junit-*.xml
 ```
 
@@ -73,7 +73,7 @@ To test your plugin in your builds prior to opening a pull request, you can refe
 steps:
   - label: Annotate
     plugins:
-      - YourGithubHandle/junit-annotate#v1.2.3:
+      - YourGithubHandle/junit-annotate#v1.6.0:
           ...
 ```
 

docker-compose.yml

@@ -1,13 +1,13 @@
 version: '2'
 services:
   plugin:
-    image: buildkite/plugin-tester:latest@sha256:18eb8917574b2e741783a0f04fb59ae806608e3cab35d33b3c7e6e37bd5bdfd8
+    image: buildkite/plugin-tester:latest@sha256:58a345bc2dbafed28c2deb5096dc8cb6c4a11958da9d890c02f5a3d870eef836
     volumes:
       - ".:/plugin"
     depends_on:
       - ruby
   ruby:
-    image: ruby:2.6-alpine@sha256:8b3dd24063423797b27407f5bd5f475796ff6e786cad00d8a0927cd472c2d3be
+    image: ruby:2.6-alpine@sha256:2564f9e429347326297055ba27092e8e575f9ee4fb409c960388a4b04ca9ebe4
     command: rake
     working_dir: /src
     volumes:

ruby/bin/annotate

@@ -78,7 +78,7 @@ failures.each do |failure|
   puts "<details>"
   puts "<summary><code>#{failure.name} in #{failure.failed_test}</code></summary>\n\n"
   if failure.body
-    puts "<code><pre>#{failure.body.chomp.strip}</pre></code>\n\n"
+    puts "<pre><code>#{failure.body.chomp.strip}</code></pre>\n\n"
   end
   if failure.job
     puts "in <a href=\"##{failure.job}\">Job ##{failure.job}</a>"

ruby/tests/annotate_test.rb

@@ -33,7 +33,7 @@
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 250 by default in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 250
              got: 500
@@ -42,15 +42,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#1">Job #1</a>
       </details>
       
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 700 if the account is XYZ in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 700
              got: 500
@@ -59,15 +59,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#2">Job #2</a>
       </details>
 
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 700 if the account is XYZ in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 700
              got: 500
@@ -76,15 +76,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#3">Job #3</a>
       </details>
 
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 250 by default in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 250
              got: 500
@@ -93,7 +93,7 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#3">Job #3</a>
       </details>
@@ -118,7 +118,7 @@
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 250 by default in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 250
              got: 500
@@ -127,15 +127,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#1">Job #1</a>
       </details>
       
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 700 if the account is XYZ in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 700
              got: 500
@@ -144,15 +144,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#2">Job #2</a>
       </details>
 
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 700 if the account is XYZ in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 700
              got: 500
@@ -161,15 +161,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#3">Job #3</a>
       </details>
 
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 250 by default in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 250
              got: 500
@@ -178,7 +178,7 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#3">Job #3</a>
       </details>
@@ -201,7 +201,7 @@
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 250 by default in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 250
              got: 500
@@ -210,7 +210,7 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#123-456">Job #123-456</a>
       </details>
@@ -235,7 +235,7 @@
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 250 by default in ./spec/models/account_spec.rb</code></summary>
 
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
 
         expected: 250
              got: 500
@@ -244,15 +244,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
 
       in <a href="#1">Job #1</a>
       </details>
 
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 700 if the account is XYZ in ./spec/models/account_spec.rb</code></summary>
 
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
 
         expected: 700
              got: 500
@@ -261,15 +261,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
 
       in <a href="#2">Job #2</a>
       </details>
 
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 700 if the account is XYZ in ./spec/models/account_spec.rb</code></summary>
 
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
 
         expected: 700
              got: 500
@@ -278,15 +278,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
 
       in <a href="#3">Job #3</a>
       </details>
 
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 250 by default in ./spec/models/account_spec.rb</code></summary>
 
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
 
         expected: 250
              got: 500
@@ -295,7 +295,7 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
 
       in <a href="#3">Job #3</a>
       </details>
@@ -320,7 +320,7 @@
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 250 by default in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 250
              got: 500
@@ -329,15 +329,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#1">Job #1</a>
       </details>
       
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 700 if the account is XYZ in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 700
              got: 500
@@ -346,15 +346,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#2">Job #2</a>
       </details>
 
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 700 if the account is XYZ in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 700
              got: 500
@@ -363,15 +363,15 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#3">Job #3</a>
       </details>
 
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 250 by default in spec.models.account_spec</code></summary>
       
-      <code><pre>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
+      <pre><code>Failure/Error: expect(account.maximum_jobs_added_by_pipeline_changer).to eql(250)
       
         expected: 250
              got: 500
@@ -380,7 +380,7 @@
       ./spec/models/account_spec.rb:78:in `block (3 levels) in <top (required)>'
       ./spec/support/database.rb:16:in `block (2 levels) in <top (required)>'
       ./spec/support/log.rb:17:in `run'
-      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</pre></code>
+      ./spec/support/log.rb:66:in `block (2 levels) in <top (required)>'</code></pre>
       
       in <a href="#3">Job #3</a>
       </details>
@@ -423,8 +423,8 @@
       <details>
       <summary><code>Account#maximum_jobs_added_by_pipeline_changer returns 250 by default in spec.models.account_spec</code></summary>
 
-      <code><pre>First line of failure output
-            Second line of failure output</pre></code>
+      <pre><code>First line of failure output
+            Second line of failure output</code></pre>
 
       </details>
     OUTPUT