Merge branch 'master' into patch-1

Author: plaindocs

.travis.yml

@@ -9,11 +9,13 @@ branches:
 env:
   global:
     - PATH=$HOME/.local/user/bin:$PATH
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
 cache:
   pip: true
   directories:
     - vendor/bundle
     - node_modules
+    - $TRAVIS_BUILD_DIR/tmp/.htmlproofer #https://github.com/gjtorikian/html-proofer/issues/381
 addons:
   apt:
     packages:
@@ -36,7 +38,9 @@ notifications:
     https://docs.travis-ci.com/update_webhook_payload_doc
 install:
   - rvm use 2.4.3 --install
+  - gem install bundler -v '< 2'
   - bundle install --deployment
+  - sudo apt-get install libcurl4-openssl-dev # required to avoid SSL errors
 script:
   - bundle exec rake test
   - xmllint --noout _site/feed.build-env-updates.xml

404.html

@@ -224,8 +224,8 @@ <h1 id="logo" class="logo">
           </h1>
           <nav>
             <ul id="navigation" class="navigation">
-              <li><a href="http://blog.travis-ci.com">Blog</a></li>
-              <li><a href="http://docs.travis-ci.com">Docs</a></li>
+              <li><a href="https://blog.travis-ci.com">Blog</a></li>
+              <li><a href="https://docs.travis-ci.com">Docs</a></li>
             </ul>
           </nav>
         </div>

Gemfile.lock

@@ -254,4 +254,4 @@ RUBY VERSION
    ruby 2.4.3p205
 
 BUNDLED WITH
-   1.16.5
+   1.17.3

README.md

@@ -1,6 +1,6 @@
 # About this repository [![Build Status](https://travis-ci.org/travis-ci/docs-travis-ci-com.svg?branch=master)](https://travis-ci.org/travis-ci/docs-travis-ci-com)
 
-This is the documentation site for Travis CI! (<http://docs.travis-ci.com/>)
+This is the documentation site for Travis CI! (<https://docs.travis-ci.com/>)
 
 ## How to contribute
 

Rakefile

@@ -1,6 +1,8 @@
 #!/usr/bin/env rake
 # frozen_string_literal: true
 
+abort('Please run this using `bundle exec rake`') unless ENV["BUNDLE_BIN_PATH"]
+
 require 'ipaddr'
 require 'json'
 require 'yaml'
@@ -38,17 +40,11 @@ desc 'Runs the tests!'
 task test: %i[build run_html_proofer]
 
 desc 'Builds the site (Jekyll and Slate)'
-task build: %i[remove_output_dir regen make_api] do
+task build: %i[regen make_api] do
   rm_f '.jekyll-metadata'
   sh 'bundle exec jekyll build --config=_config.yml'
 end
 
-desc 'Remove the output dirs'
-task :remove_output_dir do
-  rm_rf('_site')
-  rm_rf('api/*')
-end
-
 desc 'Lists files containing beta features'
 task :list_beta_files do
   files = FileList.new('**/*.md')
@@ -58,66 +54,33 @@ task :list_beta_files do
   end
 end
 
-desc 'Runs the html-proofer test'
+desc 'Check links and validate some html'
 task :run_html_proofer => [:build] do
-  HTMLProofer.check_directory(
-    './_site',
-    internal_domains: ['docs.travis-ci.com'],
-    check_external_hash: true,
-    check_html: true,
-    connecttimeout: 600,
-    allow_hash_ref: true,
-    only_4xx: true,
-    typhoeus: {
-      ssl_verifypeer: false, ssl_verifyhost: 0, followlocation: true
-    },
-    url_ignore: [
-      /itunes\.apple\.com/,
-    ],
-    file_ignore: %w[
-      ./_site/api/index.html
-    ]
-  ).run
-end
-
-desc 'Runs the html-proofer test for internal links only'
-task :run_html_proofer_internal => [:build] do
-  HTMLProofer.check_directory(
-    './_site',
-    disable_external: true,
-    internal_domains: ['docs.travis-ci.com'],
-    connecttimeout: 600,
-    only_4xx: true,
-    typhoeus: {
-      ssl_verifypeer: false, ssl_verifyhost: 0, followlocation: true
-    },
-    file_ignore: %w[
-      ./_site/api/index.html
-    ]
-  ).run
-end
-
-file '_data/trusty-language-mapping.json' do |t|
-  source = File.join(
-    'https://raw.githubusercontent.com',
-    'travis-infrastructure/terraform-config/master/aws-production-2',
-    'generated-language-mapping.json'
-  )
-
-  bytes = File.write(t.name, Faraday.get(source).body)
-
-  puts "Updated #{t.name} (#{bytes} bytes)"
-end
-
-file '_data/trusty_language_mapping.yml' => [
-  '_data/trusty-language-mapping.json'
-] do |t|
-  bytes = File.write(
-    t.name,
-    YAML.dump(JSON.parse(File.read('_data/trusty-language-mapping.json')))
-  )
-
-  puts "Updated #{t.name} (#{bytes} bytes)"
+  options = {
+      internal_domains: ['docs.travis-ci.com'],
+      check_external_hash: true,
+      check_html: true,
+      connecttimeout: 600,
+      allow_hash_ref: true,
+      #only_4xx: true,
+      typhoeus: {
+        ssl_verifypeer: false, ssl_verifyhost: 0, followlocation: true
+      },
+      url_ignore: [
+        /itunes\.apple\.com/,
+      ],
+      file_ignore: %w[
+        ./_site/api/index.html
+      ],
+      :cache => {
+        :timeframe => '3w'
+      }
+  }
+  begin
+    HTMLProofer.check_directory( './_site', options).run
+  rescue => msg
+    puts "#{msg}"
+  end
 end
 
 file '_data/ip_range.yml' do |t|
@@ -161,7 +124,6 @@ task regen: (%i[clean] + %w[
   _data/ip_range.yml
   _data/linux_containers_ip_range.yml
   _data/macstadium_ip_range.yml
-  _data/trusty_language_mapping.yml
   _data/node_js_versions.yml
 ])
 
@@ -173,10 +135,10 @@ task :clean do
          _data/ip_range.yml
          _data/linux_containers_ip_range.yml
          _data/macstadium_ip_range.yml
-         _data/trusty-language-mapping.json
-         _data/trusty_language_mapping.yml
          _data/node_js_versions.yml
        ])
+  rm_rf('_site')
+  rm_rf('api/*')
 end
 
 desc 'Start Jekyll server'

_data/enterprise.yml

@@ -0,0 +1,26 @@
+threading: |
+  Some Perls have been compiled with threading support. They have been compiled
+  with the additional compile flags `-Duseshrplib` and `-Duseithreads`:
+
+  ```
+  5.26-shrplib
+  5.24-shrplib
+  5.22-shrplib
+  5.20-shrplib
+  5.18-shrplib
+  ```
+modules: |
+  ```
+  cpanm (App::cpanminus)
+  Dist::Zilla
+  Dist::Zilla::Plugin::Bootstrap::lib
+  ExtUtils::MakeMaker
+  LWP
+  Module::Install
+  Moose
+  Test::Exception
+  Test::Kwalitee
+  Test::Most
+  Test::Pod
+  Test::Pod::Coverage
+  ```

_data/language-details/perl.yml

@@ -10,13 +10,15 @@ Elixir: "/user/languages/elixir/"
 Elm: "/user/languages/elm/"
 Erlang: "/user/languages/erlang/"
 F#: "/user/languages/csharp/"
+Generic: "/user/languages/minimal-and-generic/"
 Go: "/user/languages/go/"
 Groovy: "/user/languages/groovy/"
 Haskell: "/user/languages/haskell/"
 Haxe: "/user/languages/haxe/"
 Java: "/user/languages/java/"
 JavaScript <small>(with Node.js)</small>: "/user/languages/javascript-with-nodejs/"
 Julia: "/user/languages/julia/"
+Minimal: "/user/languages/minimal-and-generic/"
 Nix: "/user/languages/nix/"
 Objective-C: "/user/languages/objective-c/"
 Perl: "/user/languages/perl/"

_data/languages.yml

@@ -23,19 +23,34 @@ ghlimit: |
   > *per commit*, which causes the Travis CI build status displayed on GitHub
   > to be incorrect.
   > Avoid this problem by specifying a regularly updated branch for your automated builds.
-trusty_note: |
+all_note: |
   > Language versions and other build-environment specific
   > information are in our reference pages:
   >  * [Precise](/user/reference/precise/)
   >  * [Trusty](/user/reference/trusty/)
   >  * [Xenial](/user/reference/xenial/)
-  >  * [OS X](/user/reference/osx/)
-trusty_note_no_osx: |
+  >  * [macOS](/user/reference/osx/)
+  >  * [Windows](/user/reference/windows/)
+unix_note: |
   > Language versions and other build-environment specific
   > information are in our reference pages:
   >  * [Precise](/user/reference/precise/)
   >  * [Trusty](/user/reference/trusty/)
   >  * [Xenial](/user/reference/xenial/)
+  >  * [macOS](/user/reference/osx/)
+linux_note: |
+  > Language versions and other build-environment specific
+  > information are in our reference pages:
+  >  * [Precise](/user/reference/precise/)
+  >  * [Trusty](/user/reference/trusty/)
+  >  * [Xenial](/user/reference/xenial/)
+linux_windows_note: |
+  > Language versions and other build-environment specific
+  > information are in our reference pages:
+  >  * [Precise](/user/reference/precise/)
+  >  * [Trusty](/user/reference/trusty/)
+  >  * [Xenial](/user/reference/xenial/)
+  >  * [Windows](/user/reference/windows/)
 concurrent_jobs: |
   The maximum number of concurrent jobs depends on the total system load, but
   one situation in which you might want to set a particular limit is:
@@ -60,7 +75,7 @@ contact_enterprise_support: |
    
   - Description of the problem - what are you observing?
   - Which steps did you try already?
-  - A support bundle (You can get it from `https://yourdomain:8800/support`)
+  - A support bundle (You can get it from `https://<your-travis-ci-enterprise-domain>:8800/support`)
   - Log files from all workers (They can be found at `/var/log/upstart/travis-worker.log` - please include as many as you can retrieve).
   - If a build failed or errored, a text file of the build log
   

_data/snippets.yml

@@ -1,4 +1,64 @@
 osx_images:
+  - image: xcode10.2
+    xcode: "10.2"
+    osx_version: "10.14"
+    xcode_full_version: "10.2.1"
+    xcode_build_version: "10E1001"
+    image_publish_date: 2019-04-18
+    sdks:
+      - macosx10.14
+      - iphoneos12.2
+      - iphonesimulator12.2
+      - appletvos12.2
+      - appletvsimulator12.2
+      - watchos5.2
+      - watchsimulator5.2
+    simulators:
+      - iOS 8.1
+      - iOS 8.2
+      - iOS 8.3
+      - iOS 8.4
+      - iOS 9.0
+      - iOS 9.1
+      - iOS 9.2
+      - iOS 9.3
+      - iOS 10.0
+      - iOS 10.1
+      - iOS 10.2
+      - iOS 10.3
+      - iOS 11.0
+      - iOS 11.1
+      - iOS 11.2
+      - iOS 11.3
+      - iOS 11.4
+      - iOS 12.0
+      - iOS 12.1
+      - iOS 12.2
+      - tvOS 9.0
+      - tvOS 9.1
+      - tvOS 9.2
+      - tvOS 10.0
+      - tvOS 10.1
+      - tvOS 10.2
+      - tvOS 11.0
+      - tvOS 11.1
+      - tvOS 11.2
+      - tvOS 11.3
+      - tvOS 11.4
+      - tvOS 12.0
+      - tvOS 12.1
+      - tvOS 12.2
+      - watchOS 2.0
+      - watchOS 2.1
+      - watchOS 2.2
+      - watchOS 3.2
+      - watchOS 4.0
+      - watchOS 4.1
+      - watchOS 4.2
+      - watchOS 5.0
+      - watchOS 5.1
+      - watchOS 5.2
+    jdk: "12+33"
   - image: xcode10.1
     xcode: "10.1"
     osx_version: "10.13"