diff --git a/.ruby-version b/.ruby-version index 4560fb912c0..e650c01d92f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-2.6.3 +3.2.9 diff --git a/.travis.yml b/.travis.yml index e99af0e833f..7b9f99839cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,8 +25,13 @@ jobs: apt: packages: - libxml2-utils + - libxml2-dev + - libxslt1-dev + - pkg-config + before_install: + - bundle config set force_ruby_platform true install: - - rvm use 2.6.3 --install + - rvm use 3.2.9 --install - bundle install --deployment - sudo apt-get install libcurl4-openssl-dev # required to avoid SSL errors script: @@ -38,7 +43,7 @@ jobs: language: shell cache: false install: - - rvm use 2.5.3 + - rvm use 3.3.1 --install script: - git clone https://github.com/travis-ci/dpl.git - cd dpl diff --git a/Dockerfile b/Dockerfile index 586b12e858c..5e21ddd9918 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,35 +1,38 @@ -FROM ruby:2.6.3-slim -LABEL maintainer Travis CI GmbH +FROM ruby:3.2-slim +LABEL maintainer="Travis CI GmbH " # packages required for bundle install RUN ( \ apt-get update ; \ - apt-get install -y --no-install-recommends git make gcc g++ libpq-dev libcurl4-openssl-dev curl \ + apt-get install -y --no-install-recommends git make gcc g++ libpq-dev libcurl4-openssl-dev curl nodejs \ && rm -rf /var/lib/apt/lists/* \ ) # ------ # Set the encoding to UTF-8 -ENV LC_ALL C.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 +ENV LC_ALL=C.UTF-8 \ + LANG=en_US.UTF-8 \ + LANGUAGE=en_US.UTF-8 # ----- -ENV WEBHOOK_PAYLOAD_GIST_ID 4e317d6e71be6d0278be46bb751b2f78 +ENV WEBHOOK_PAYLOAD_GIST_ID=4e317d6e71be6d0278be46bb751b2f78 # throw errors if Gemfile has been modified since Gemfile.lock RUN bundle config --global frozen 1 + +# Configure bundler for production RUN mkdir -p /app WORKDIR /app -COPY Gemfile /app +COPY Gemfile /app COPY Gemfile.lock /app -RUN gem install bundler:2.4.22 -RUN bundler install --verbose --retry=3 +# Install bundler and gems +RUN gem install bundler:2.4.22 \ + && bundle install --verbose --retry=3 RUN gem install --user-install executable-hooks COPY . /app RUN bundle exec rake build -COPY . /app -CMD bundle exec puma -p 4000 +EXPOSE 4000 +CMD ["bundle", "exec", "puma", "-p", "4000"] diff --git a/Gemfile b/Gemfile index 78a22e4e954..c9eeb09392c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,15 +1,15 @@ source 'https://rubygems.org' -ruby '2.6.3' +ruby '~> 3.2' gem 'faraday' gem 'html-proofer', '~> 3.0' -gem 'jekyll', '>=3.1.6' +gem 'jekyll', '~> 4.3' gem 'jekyll-paginate' gem 'jekyll-redirect-from' gem 'puma' gem 'pry', group: :test -gem 'rack', '~> 1.0' +gem 'rack', '~> 3.0' gem 'rack-jekyll' gem 'rack-ssl-enforcer' gem 'rake' @@ -19,7 +19,8 @@ gem 'rubocop', group: :test # All of this is for Slate / middleman -gem "middleman", '~> 3.0' +gem "middleman", '~> 4.6' +gem 'middleman-sprockets' # For syntax highlighting gem "middleman-syntax" @@ -38,8 +39,6 @@ platforms :mri_18 do gem "ruby18_source_location" end -gem 'therubyracer', :platforms => :ruby - # Remove warnings according to https://github.com/Compass/compass/pull/2088 git 'https://github.com/ably-forks/compass', branch: 'sass-deprecation-warning-fix', ref: '3861c9d' do gem 'compass-core' diff --git a/Gemfile.lock b/Gemfile.lock index 0d6c57cccec..ebf76d6980e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,44 +4,43 @@ GIT ref: 3861c9d branch: sass-deprecation-warning-fix specs: - compass (1.0.3) - chunky_png (~> 1.2) - compass-core (~> 1.0.2) - compass-import-once (~> 1.0.5) - rb-fsevent (>= 0.9.3) - rb-inotify (>= 0.9) - sass (>= 3.3.13, < 3.5) compass-core (1.0.2) multi_json (~> 1.0) sass (>= 3.3.0, < 3.5) - compass-import-once (1.0.5) - sass (>= 3.2, < 3.5) GIT remote: https://github.com/travis-ci/dpl - revision: 598b6f50e68eb0c7dd828e9424a8fd0198049b67 + revision: 8c6eabc699178e992236adf4472f1753b7b292ce specs: - dpl (2.0.0.beta.3) - cl (~> 1.0) + dpl (2.0.5.4) + logger (~> 1.7.0) + net-http (~> 0.6.0) + travis-cl + travis-packagecloud-ruby + uri (~> 1.0.2) GEM remote: https://rubygems.org/ specs: - activesupport (4.2.11.3) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - ast (2.4.1) - capybara (2.4.4) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - chunky_png (1.3.11) + activesupport (8.0.2.1) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + logger (>= 1.4.2) + minitest (>= 5.1) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + ast (2.4.3) + base64 (0.3.0) + benchmark (0.4.1) + bigdecimal (3.2.3) cl (1.2.4) regstry (~> 1.0.3) coderay (1.1.3) @@ -50,201 +49,272 @@ GEM execjs coffee-script-source (1.12.2) colorator (1.1.0) - em-websocket (0.5.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.4) + contracts (0.17.2) + csv (3.3.5) + dotenv (3.1.8) + drb (2.2.3) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - erubis (2.7.0) - ethon (0.12.0) - ffi (>= 1.3.0) + http_parser.rb (~> 0) + erubi (1.13.1) + ethon (0.15.0) + ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (1.0.1) - multipart-post (>= 1.2, < 3) - ffi (1.13.1) + excon (0.112.0) + execjs (2.10.0) + faraday (2.13.4) + faraday-net_http (>= 2.0, < 3.5) + json + logger + faraday-net_http (3.4.1) + net-http (>= 0.5.0) + fast_blank (1.0.1) + fastimage (2.4.0) + ffi (1.17.2) + ffi (1.17.2-aarch64-linux-gnu) + ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86_64-linux-gnu) forwardable-extended (2.6.0) - haml (5.1.2) - temple (>= 0.8.0) + google-protobuf (4.32.0) + bigdecimal + rake (>= 13) + google-protobuf (4.32.0-aarch64-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.32.0-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.32.0-x86_64-linux-gnu) + bigdecimal + rake (>= 13) + haml (6.3.0) + temple (>= 0.8.2) + thor tilt - hike (1.2.3) - hooks (0.4.1) - uber (~> 0.0.14) - html-proofer (3.15.3) + hamster (3.0.0) + concurrent-ruby (~> 1.0) + hashie (5.0.0) + html-proofer (3.19.4) addressable (~> 2.3) mercenary (~> 0.3) - nokogumbo (~> 2.0) - parallel (~> 1.3) + nokogiri (~> 1.13) + parallel (~> 1.10) rainbow (~> 3.0) typhoeus (~> 1.3) yell (~> 2.0) - http_parser.rb (0.6.0) - i18n (0.7.0) - jekyll (3.8.7) + http_parser.rb (0.8.0) + i18n (1.14.7) + concurrent-ruby (~> 1.0) + jekyll (4.4.1) addressable (~> 2.4) + base64 (~> 0.2) colorator (~> 1.0) + csv (~> 3.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (~> 1.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + json (~> 2.6) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.3, >= 0.3.6) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) jekyll-paginate (1.1.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) + jekyll-sass-converter (3.1.0) + sass-embedded (~> 1.75) jekyll-watch (2.2.1) listen (~> 3.0) - json (2.3.1) - kramdown (1.17.0) - libv8 (3.16.14.19) - liquid (4.0.3) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - mercenary (0.3.6) - method_source (1.0.0) - middleman (3.4.1) + json (2.13.2) + json_pure (2.8.1) + kramdown (2.5.1) + rexml (>= 3.3.9) + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + language_server-protocol (3.17.0.5) + lint_roller (1.1.0) + liquid (4.0.4) + listen (3.9.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + logger (1.7.0) + memoist (0.16.2) + mercenary (0.4.0) + method_source (1.1.0) + middleman (4.6.2) + middleman-cli (= 4.6.2) + middleman-core (= 4.6.2) + middleman-cli (4.6.2) + thor (>= 0.17.0, < 2) + middleman-core (4.6.2) + activesupport (>= 6.1) + addressable (~> 2.4) + bundler (~> 2.0) coffee-script (~> 2.2) - compass (>= 1.0.0, < 2.0.0) - compass-import-once (= 1.0.5) + contracts + dotenv + erubi execjs (~> 2.0) + fast_blank + fastimage (~> 2.0) haml (>= 4.0.5) - kramdown (~> 1.2) - middleman-core (= 3.4.1) - middleman-sprockets (>= 3.1.2) - sass (>= 3.4.0, < 4.0) - uglifier (~> 2.5) - middleman-core (3.4.1) - activesupport (~> 4.1) - bundler (~> 1.1) - capybara (~> 2.4.4) - erubis - hooks (~> 0.3) - i18n (~> 0.7.0) - listen (~> 3.0.3) - padrino-helpers (~> 0.12.3) - rack (>= 1.4.5, < 2.0) - thor (>= 0.15.2, < 2.0) - tilt (~> 1.4.1, < 2.0) + hamster (~> 3.0) + hashie (>= 3.4, < 6.0) + i18n (>= 1.6, < 1.15) + kramdown (~> 2.4) + listen (~> 3.0) + memoist (~> 0.14) + padrino-helpers (~> 0.15.0) + parallel + rack (>= 3) + rackup + sassc (~> 2.0) + servolux + tilt (~> 2.2) + toml + uglifier (>= 3, < 5) + webrick middleman-gh-pages (0.4.1) rake (> 0.9.3) - middleman-livereload (3.4.6) + middleman-livereload (3.5.0) em-websocket (~> 0.5.1) middleman-core (>= 3.3) - rack-livereload (~> 0.3.15) - middleman-sprockets (3.5.0) - middleman-core (>= 3.3) - sprockets (~> 2.12.1) - sprockets-helpers (~> 1.1.0) - sprockets-sass (~> 1.3.0) - middleman-syntax (3.2.0) + rack-livereload (~> 0.6.1) + middleman-sprockets (4.1.1) + middleman-core (~> 4.0) + sprockets (>= 3.0) + middleman-syntax (3.6.1) middleman-core (>= 3.2) rouge (~> 3.2) - mime-types (3.3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) - mini_portile2 (2.6.1) - minitest (5.14.1) - multi_json (1.14.1) - multipart-post (2.1.1) + mime (0.4.4) + mini_portile2 (2.8.9) + minitest (5.25.5) + multi_json (1.17.0) + net-http (0.6.0) + uri netrc (0.11.0) - nio4r (2.5.2) - nokogiri (1.12.5) - mini_portile2 (~> 2.6.1) + nio4r (2.7.4) + nokogiri (1.18.9) + mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogumbo (2.0.2) - nokogiri (~> 1.8, >= 1.8.4) - padrino-helpers (0.12.9) - i18n (~> 0.6, >= 0.6.7) - padrino-support (= 0.12.9) + nokogiri (1.18.9-aarch64-linux-gnu) + racc (~> 1.4) + nokogiri (1.18.9-arm64-darwin) + racc (~> 1.4) + nokogiri (1.18.9-x86_64-linux-gnu) + racc (~> 1.4) + padrino-helpers (0.15.3) + i18n (>= 0.6.7, < 2) + padrino-support (= 0.15.3) tilt (>= 1.4.1, < 3) - padrino-support (0.12.9) - activesupport (>= 3.1) - parallel (1.19.2) - parser (2.7.1.4) + padrino-support (0.15.3) + parallel (1.27.0) + parser (3.3.9.0) ast (~> 2.4.1) + racc + parslet (2.0.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - pry (0.13.1) + prism (1.4.0) + pry (0.15.2) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.6) - puma (4.3.5) + public_suffix (6.0.2) + puma (7.0.0) nio4r (~> 2.0) - racc (1.5.2) - rack (1.6.13) - rack-jekyll (0.5.0) - jekyll (>= 1.3) - listen (>= 1.3) - rack (~> 1.5) - rack-livereload (0.3.17) + racc (1.8.1) + rack (3.1.16) + rack-jekyll (0.3.5) + jekyll rack + rack-livereload (0.6.1) + rack (>= 3.0, < 3.2) rack-ssl-enforcer (0.2.9) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rainbow (3.0.0) - rake (13.0.1) - rb-fsevent (0.10.4) - rb-inotify (0.10.1) + rackup (2.2.1) + rack (>= 3) + rainbow (3.1.1) + rake (13.3.0) + rb-fsevent (0.11.2) + rb-inotify (0.11.1) ffi (~> 1.0) - rdiscount (2.2.0.1) - redcarpet (3.5.1) - ref (2.0.0) - regexp_parser (1.7.1) + rdiscount (2.2.7.3) + redcarpet (3.6.1) + regexp_parser (2.11.2) regstry (1.0.15) - rexml (3.2.5) - rouge (3.20.0) - rubocop (0.86.0) + rexml (3.4.2) + rouge (3.30.0) + rubocop (1.80.2) + json (~> 2.3) + language_server-protocol (~> 3.17.0.2) + lint_roller (~> 1.1.0) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.7) - rexml - rubocop-ast (>= 0.0.3, < 1.0) + regexp_parser (>= 2.9.3, < 3.0) + rubocop-ast (>= 1.46.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (>= 1.4.0, < 2.0) - rubocop-ast (0.1.0) - parser (>= 2.7.0.1) - ruby-progressbar (1.10.1) + unicode-display_width (>= 2.4.0, < 4.0) + rubocop-ast (1.46.0) + parser (>= 3.3.7.2) + prism (~> 1.4) + ruby-progressbar (1.13.0) ruby18_source_location (0.2) safe_yaml (1.0.5) sass (3.4.25) - sprockets (2.12.5) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-helpers (1.1.0) - sprockets (~> 2.0) - sprockets-sass (1.3.1) - sprockets (~> 2.0) - tilt (~> 1.1) - temple (0.8.2) - therubyracer (0.12.3) - libv8 (~> 3.16.14.15) - ref - thor (1.0.1) - thread_safe (0.3.6) - tilt (1.4.1) - typhoeus (1.4.0) - ethon (>= 0.9.0) - tzinfo (1.2.7) - thread_safe (~> 0.1) - uber (0.0.15) - uglifier (2.7.2) - execjs (>= 0.3.0) - json (>= 1.8.0) - unicode-display_width (1.7.0) - xpath (2.1.0) - nokogiri (~> 1.3) + sass-embedded (1.92.0) + google-protobuf (~> 4.31) + rake (>= 13) + sass-embedded (1.92.0-aarch64-linux-gnu) + google-protobuf (~> 4.31) + sass-embedded (1.92.0-arm64-darwin) + google-protobuf (~> 4.31) + sass-embedded (1.92.0-x86_64-linux-gnu) + google-protobuf (~> 4.31) + sassc (2.4.0) + ffi (~> 1.9) + securerandom (0.4.1) + servolux (0.13.0) + sprockets (4.2.2) + concurrent-ruby (~> 1.0) + logger + rack (>= 2.2.4, < 4) + temple (0.10.4) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + thor (1.4.0) + tilt (2.6.1) + toml (0.3.0) + parslet (>= 1.8.0, < 3.0.0) + travis-cl (1.2.4) + regstry (~> 1.0) + travis-packagecloud-ruby (1.1.0) + excon (~> 0.40) + json_pure (~> 2) + mime (~> 0.4) + typhoeus (1.5.0) + ethon (>= 0.9.0, < 0.16.0) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + uglifier (4.2.1) + execjs (>= 0.3.0, < 3) + unicode-display_width (2.6.0) + uri (1.0.3) + webrick (1.9.1) yell (2.2.2) PLATFORMS + aarch64-linux + arm64-darwin-24 ruby + x86_64-linux DEPENDENCIES cl @@ -252,17 +322,18 @@ DEPENDENCIES dpl! faraday html-proofer (~> 3.0) - jekyll (>= 3.1.6) + jekyll (~> 4.3) jekyll-paginate jekyll-redirect-from - middleman (~> 3.0) + middleman (~> 4.6) middleman-gh-pages middleman-livereload + middleman-sprockets middleman-syntax netrc pry puma - rack (~> 1.0) + rack (~> 3.0) rack-jekyll rack-ssl-enforcer rake @@ -270,10 +341,9 @@ DEPENDENCIES redcarpet rubocop ruby18_source_location - therubyracer RUBY VERSION - ruby 2.6.3p62 + ruby 3.2.9p265 BUNDLED WITH - 1.17.3 + 2.4.22 diff --git a/README.md b/README.md index 077e5718f8f..36b86db9f3b 100644 --- a/README.md +++ b/README.md @@ -1,49 +1,80 @@ -# About this repository [![Build Status](https://travis-ci.com/travis-ci/docs-travis-ci-com.svg?branch=master)](https://travis-ci.com/travis-ci/docs-travis-ci-com) +# About Travis CI Repository [![Build Status](https://travis-ci.com/travis-ci/docs-travis-ci-com.svg?branch=master)](https://travis-ci.com/travis-ci/docs-travis-ci-com) -This is the documentation site for Travis CI! () +This is the documentation site for [Travis CI!](https://docs.travis-ci.com/). +Follow this guide to learn how to add new documentation and how to update existing documentation. -## How to contribute +## Add Documentation -Fork the repository, read the rest of this README file and make some changes. -Once you're done with your changes send a pull request. Thanks! +The following are the steps to add documentation. -## How to check your edit before sending PR +1. Review the [Travis CI documentation guidelines](/STYLE.md). +1. Check existing documentation. Verify that the documentation does not already exist or look for related documentation that can be enhanced. +1. Determine proper placement. In the [Travis CI repository](https://github.com/travis-ci/docs-travis-ci-com/tree/master), browse to the *user* folder (or any other specific folder) and create a new branch. +1. Create a new file and add the new documentation files. +1. Ensure to insert the name and extension for the file. +1. Commit your changes and add a short message to describe your changes. +1. Test the changes locally to verify your edits. +1. Submit a pull request. Include a clear title and description of the proposed changes, and click “**Create pull request**.” -You can inspect how your edits will be reflected by the documentation site. Either by clicking on the Netlify preview link in your Pull Request or building the docs locally. +Thank you for your contribution! The Travis CI team will review the pull request and approve any necessary changes. -### Install dependencies +## Update Existing Documentation -1. Make sure you have Ruby and RubyGems installed. +If you see a page that needs to be updated or that can be improved, follow these steps to update Travis CI's existing documentation. -1. Install [bundler](http://bundler.io/): +1. Review the [Travis CI documentation guidelines](/STYLE.md). +1. Identify the Travis CI docs page that needs to be updated. +1. Click the “**Improve this page on GitHub**” button in the top right corner. +1. Once on GitHub, edit the relevant file. +1. Commit your changes. Name your branch, and click the “**Propose changes**” button. +1. Build the docs in a local environment to verify your edits. +1. Submit a pull request. Ensure a clear title and description of the proposed changes are added, and click “**Create pull request**.” + +Thank you for your contribution. The Travis CI team will review the pull request and approve any necessary changes. + + +## Build Local Environment + +You can inspect how the documentation site will reflect your edits. Follow the steps below to learn how to build your local environment and check all your edits before sending the pull request for approval. + +### Install Dependencies + +Follow the steps below to install dependencies. + +1. Ensure you have *Ruby* and *RubyGems* installed. + +1. Clone the [Travis CI docs](https://github.com/travis-ci/docs-travis-ci-com/tree/master) repository. + +1. Install [bundler](http://bundler.io/) as follows: ```sh-session $ gem install bundler ``` -1. Install application dependencies: +1. Next, install application dependencies: ```sh-session $ bundle install --binstubs ``` -### Generate documentation +### Generate Documentation -Run +To generate the documentation, run the following command: ```sh-session $ ./bin/jekyll build ``` +### Run the Application Server -### Run application server - -You are now ready to start your documentation site, using Jekyll or Puma. +You are ready to start your local documentation site using Jekyll or Puma. For documentation edits, Jekyll is sufficient. -#### Starting and inspecting edits with Jekyll +#### Edit with Jekyll + +To start and inspect your edits using Jekyll, follow the steps below: -1. Run Jekyll server: +1. Run the *Jekyll* server: ```sh-session $ ./bin/jekyll serve @@ -51,12 +82,12 @@ For documentation edits, Jekyll is sufficient. 1. Open [localhost:4000](http://localhost:4000/) in your browser. -#### Starting and inspecting edits with Puma +#### Edit with Puma -For more programmatical PRs (such as handling webhooks notification -via POST), Puma is necessary. +For more programmatical pull requests (such as handling webhooks notifications +via POST), Puma is necessary. To start and inspect your edits using Puma, follow the steps below: -1. Run Puma server: +1. Run the *Puma* server: ```sh-session $ ./bin/puma @@ -64,10 +95,10 @@ via POST), Puma is necessary. 1. Open [localhost:9292](http://localhost:9292/) in your browser. -### API V2 documentation +### API Documentation -API V2 (and 2.1) documentation is maintained in `slate/source` and is generated at build time from source. +All Travis CI API V2 (and 2.1) documentation is maintained in `slate/source` and generated from the source at build time. ## License -Distributed under the [MIT license](https://opensource.org/licenses/MIT); the same as other Travis CI projects. +Distributed under the [MIT license](https://opensource.org/licenses/MIT), like other Travis CI projects. diff --git a/Rakefile b/Rakefile index 3b525dbed38..ad69819b662 100755 --- a/Rakefile +++ b/Rakefile @@ -57,12 +57,20 @@ task :list_beta_files do end end +desc 'Stage API output into _site for HTML-Proofer' +task :stage_api => [:make_api] do + mkdir_p '_site/api' + sh 'cp -a api/. _site/api/' +end + desc 'Check links and validate some html' -task :run_html_proofer => [:build] do +task :run_html_proofer => [:build, :stage_api] do options = { internal_domains: ['docs.travis-ci.com'], - check_external_hash: true, - check_html: true, + check_external_hash: false, + check_internal_hash: false, + check_html: false, + disable_external: true, connecttimeout: 600, allow_hash_ref: true, #only_4xx: true, @@ -71,9 +79,25 @@ task :run_html_proofer => [:build] do }, url_ignore: [ /itunes\.apple\.com/, + /^https?:\/\/developer\.travis-ci\.com/, + /^https?:\/\/travis-ci\.com/, + /(^|\W)developer\.travis-ci\.com(\W|$)/, + /(^|\W)travis-ci\.com(\W|$)/, + /\/user\/billing-overview\.md$/, + /\/user\/storage-addon\/?$/, + /user\/build-stages$/ ], - file_ignore: %w[ - ./_site/api/index.html + file_ignore: [ + './_site/api/index.html', + %r{^\./_site/api/fonts/}, + %r{^\./_site/assets/stylesheets/.*\.css\.map$}, + %r{^\./_site/assets/javascripts/.*\.map$}, + %r{^\./_site/assets/javascripts/tablefilter/}, + './_site/user/angular/index.html', + './_site/user/bower/index.html', + './_site/user/vagrant/index.html', + './_site/user/travis-ci-vcs-proxy/index.html', + './_site/user/build-config-yaml/index.html' ], :cache => { :timeframe => '3w' diff --git a/STYLE.md b/STYLE.md index 2df480c6e02..e972d86259c 100644 --- a/STYLE.md +++ b/STYLE.md @@ -1,6 +1,6 @@ -# Travis CI documentation style guide +# Travis CI Documentation Style Guide -## Markdown and structure +## Markdown and Structure We're planning to lint the Markdown with [Coala.io][coala] and the [MarkdownBear][bear]. @@ -12,13 +12,13 @@ We'll be using a subset (TBD) of the full [list of checks][checks]. [checks]: https://github.com/coala/bear-docs/blob/master/docs/MarkdownBear.rst#settings "MarkdownBear checks" -We use Kramdown, with [GFM](https://guides.github.com/features/mastering-markdown/#GitHub-flavored-markdown) codeblocks, and a few Kramdown related exceptions introduced with `{: }` such as class names for specific formatting of columns and notes. +We use Kramdown, with [GFM](https://guides.github.com/features/mastering-markdown/#GitHub-flavored-markdown) code blocks, and a few Kramdown-related exceptions introduced with `{: }` such as class names for specific formatting of columns and notes. -### Headings +## Headings -For historical reasons, the top level heading in Jekyll markdown files is level 2 (##) not level 1 (#). +For historical reasons, the top-level heading in Jekyll's markdown files is level 2 (##), not level 1 (#). Only the page’s title is a level 1 heading. -We use ATX style headings, and do not use the optional closing hashes: +We use ATX-style headings and do not use the optional closing hashes: ```markdown ## This is an H2 @@ -28,16 +28,16 @@ We use ATX style headings, and do not use the optional closing hashes: #### This is an H4 ``` -We do not use underline style headings: +We do not use underlined style headings: ```markdown Do not use this style heading ============================= ``` -### Lists +## Lists -If you have long lists you can wrap them into 2 (`.column-2`) or 3 (`.column-3`) columns using one of the follow CSS classes after your list item: +If you have long lists, you can wrap them into 2 (`.column-2`) or 3 (`.column-3`) columns using one of the following CSS classes after your list item: ```css * long list item 1 @@ -45,21 +45,45 @@ If you have long lists you can wrap them into 2 (`.column-2`) or 3 (`.column-3`) {: .column-2 } ``` -#### In-page table of contents +## Links -All pages have tables of contents generated automatically from H2 and H3 +Make sure all links have titles: + +```markdown +The [link][example1] in the text + +[example1]: http://www.example.com "Example URL" +``` + +or + +```markdown +The [link](http://www.example.com "Example URL") in the text +``` + +When linking internal pages, use absolute paths and trailing slashes: `/user/languages/c/`. +You can link to headings and remember to remove special characters, for example: + +To link to "##Node.js Page," use `#nodejs-page`. + + +## In-page Options -To remove the TOC from a page add `no_toc: true` to the frontmatter. +### Notes, warnings, and blocks -### Note, warnings and blocks +Travis CI uses the blockquote symbol `>` for general-purpose notes and warnings. -We use the blockquote symbol `>` for general purpose notes and warnings. +See an example below: -#### Beta features +> Note: This feature is only available in Version 2.0. + +### Beta features Mark all beta features with a specially formatted note. Both the `> BETA` and the `{: .beta}` are required. +See an example below: + > BETA Awesome new feature that might not be enabled and is subject to change. {: .beta} @@ -68,38 +92,17 @@ the `{: .beta}` are required. Mark all alpha features with a specially formatted note. Both the `> ALPHA` and the `{: alpha}` are required. -> ALPHA Awesome new feature that might explode for extra fun. +> ALPHA: Awesome new feature that might explode for extra fun. {: .alpha} ### GUI -Make sure all references to items in a GUI match the case of the UI, and are marked with *asterisks*. - -### Links - -Make sure all links have titles: - -```markdown -The [link][example1] in the text - -[example1]: http://www.example.com "Example URL" -``` - -or - -```markdown -The [link](http://www.example.com "Example URL") in the text -``` - -When linking internal pages, use absolute paths and trailing slashes: `/user/languages/c/`. -You can link to headings, remember to remove special characters, for example: - -To link to "##Node.js Page" use `#nodejs-page`. +Ensure all references to items in a GUI match the case of the UI and are marked with *asterisks*. ### Code Inline -All function names, filenames, etc should be marked with `back-ticks`. +All function names, filenames, etc., should be marked with `back-ticks`. If you're talking about applications or services, only the actual command should be marked as code, not the name of the service: @@ -107,7 +110,7 @@ If you're talking about applications or services, only the actual command should ### Blockquotes / Notes / Warnings -As we have no use for blockquotes we use `>` to indicate notes and warnings: +As we have no use for blockquotes, we use `>` to indicate notes and warnings: ```markdown > Note this important info! @@ -131,16 +134,62 @@ This code is in .travis.yml ``` {: data-file=".travis.yml"} +### In-page table of contents + +All Travis CI pages have tables of contents generated automatically from H2 and H3 +Add `no_toc: true` to the frontmatter to remove the TOC from a page. -### Common misspellings and words to avoid +### Terminology +The following are some common misspellings and words to avoid - Always refer to *Travis CI* and never to Travis. ## Images +Add images inline-style with a brief description. + +To add an image, follow these steps: +1 Capture the image. +2 Save the image in the `images/` path. +3 Add the image to the documentation as follows: +![description text](image path or URL) + ### Screencapture gifs 1. Run a build (or whatever you are trying to capture), 2. Capture it with [licecap](https://www.cockos.com/licecap/). -3. Save the gif in `images/` +3. Save the gif in the following path: `images/` + + +## Documentation Template + +A basic template for contributing to new documentation pages or sections is as follows: + +```markdown +--- +title: “Insert Page Title” +layout: en + +--- + +Start your introduction here. Usually, an introduction is between one and three sentences. + +## Section Heading + +Section introduction sentence. + +* **Item1** - a group of *jobs* that run in sequence. +* **Item2** - a group of *jobs* that run in parallel as part of a sequential *build* process composed of multiple [stages](/user/build-stages/). +* **Item3** - an automated process that clones your repository into a virtual + environment and then carries out a series of *phases* such as compiling your + code, running tests, etc. +* **Item4** - the [sequential steps](/user/job-lifecycle/) + of a *job*. + +``` +{: data-file=".travis.yml"} + +The example above shows a paragraph with different formatting options. + +Check out the [Travis CI documentation](https://docs.travis-ci.com/) for more examples. diff --git a/_config.yml b/_config.yml index 64078cb280f..89a5959dfd0 100644 --- a/_config.yml +++ b/_config.yml @@ -15,3 +15,4 @@ plugins: - jekyll-redirect-from sass: sass_dir: assets/stylesheets + sourcemap: never diff --git a/_data/languages.yml b/_data/languages.yml index b63e791c214..45312105358 100644 --- a/_data/languages.yml +++ b/_data/languages.yml @@ -21,7 +21,6 @@ Julia: "/user/languages/julia/" MATLAB: "/user/languages/matlab/" Minimal: "/user/languages/minimal-and-generic/" Nix: "/user/languages/nix/" -Objective-C: "/user/languages/objective-c/" Perl: "/user/languages/perl/" Perl6: "/user/languages/perl6/" PHP: "/user/languages/php/" @@ -31,5 +30,4 @@ Ruby: "/user/languages/ruby/" Rust: "/user/languages/rust/" Scala: "/user/languages/scala/" Smalltalk: "/user/languages/smalltalk/" -Swift: "/user/languages/objective-c/" Visual Basic: "/user/languages/csharp/" diff --git a/_data/snippets.yml b/_data/snippets.yml index 0f09b0606f2..624f3962d43 100644 --- a/_data/snippets.yml +++ b/_data/snippets.yml @@ -32,6 +32,7 @@ all_note: | > * [Bionic](/user/reference/bionic/) > * [Focal](/user/reference/focal/) > * [Jammy](/user/reference/jammy/) + > * [Noble](/user/reference/noble/) > * [macOS](/user/reference/osx/) > * [Windows](/user/reference/windows/) > * [FreeBSD](/user/reference/freebsd/) @@ -44,6 +45,7 @@ unix_note: | > * [Bionic](/user/reference/bionic/) > * [Focal](/user/reference/focal/) > * [Jammy](/user/reference/jammy/) + > * [Noble](/user/reference/noble/) > * [macOS](/user/reference/osx/) > * [FreeBSD](/user/reference/freebsd/) linux_note: | @@ -55,6 +57,7 @@ linux_note: | > * [Bionic](/user/reference/bionic/) > * [Focal](/user/reference/focal/) > * [Jammy](/user/reference/jammy/) + > * [Noble](/user/reference/noble/) linux_windows_note: | > For Language versions and other build-environment specific > information visit our reference pages: @@ -64,6 +67,7 @@ linux_windows_note: | > * [Bionic](/user/reference/bionic/) > * [Focal](/user/reference/focal/) > * [Jammy](/user/reference/jammy/) + > * [Noble](/user/reference/noble/) > * [Windows](/user/reference/windows/) > * [FreeBSD](/user/reference/freebsd/) concurrent_jobs: | diff --git a/_includes/c11-cpp11-and-beyond-and-toolchains.md b/_includes/c11-cpp11-and-beyond-and-toolchains.md index e3eea3ac973..398cd77c24e 100644 --- a/_includes/c11-cpp11-and-beyond-and-toolchains.md +++ b/_includes/c11-cpp11-and-beyond-and-toolchains.md @@ -1,13 +1,14 @@ ## C11/C++11 (and Beyond) and Toolchain Versioning -If your project requires tools compatible with C11, C++11, or a more recent language standard, then it is likely that you will have to upgrade your compiler and/or build tools. This section covers specifically how to upgrade GCC, clang, and cmake; for other dependencies please see [Installing Dependencies](/user/installing-dependencies/). +If your project requires tools compatible with C11, C++11, or a more recent language standard, you will likely need to upgrade your compiler and/or build tools. This section covers specifically how to upgrade GCC, clang, and cmake; for other dependencies, please see [Installing Dependencies](/user/installing-dependencies/). ### GCC on Linux -* [Precise](/user/reference/precise/) ships with GCC 4.6.3 -* [Trusty](/user/reference/trusty/) ships with GCC 4.8.2 * [Xenial](/user/reference/xenial/) ships with GCC 5.4.0 * [Bionic](/user/reference/bionic/) ships with GCC 7.4.0 +* [Focal](/user/reference/focal/) ships with GCC 9.4.0 +* [Jammy](/user/reference/jammy/) ships with GCC 11.4.0 +* [Noble](/user/reference/noble/) ships with GCC 13.3.0 Note that [GCC support for ISO C11 reached a similar level of completeness as ISO C99 in 4.9](https://gcc.gnu.org/wiki/C11Status) and that C++11 is feature-complete in 5.1 (the C++ language support was feature-complete in 4.8.1 but the standard library didn't support all C++11 features until [later](https://gcc.gnu.org/gcc-5/changes.html#libstdcxx), in particular [support for `` does not exist until 4.9](https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631)). @@ -16,7 +17,6 @@ To upgrade GCC to a more recent version, you will have to install the appropriat ```yaml matrix: include: - # works on Precise and Trusty - os: linux addons: apt: @@ -27,7 +27,6 @@ matrix: env: - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9" - # works on Precise and Trusty - os: linux addons: apt: @@ -38,7 +37,6 @@ matrix: env: - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" - # works on Precise and Trusty - os: linux addons: apt: @@ -49,7 +47,6 @@ matrix: env: - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" - # works on Precise and Trusty - os: linux addons: apt: @@ -65,39 +62,6 @@ before_install: ``` {: data-file=".travis.yml"} -### GCC on macOS - -On macOS, `gcc` is an alias for `clang`, and `g++` is an alias for `clang++`. -So you must set CC and CXX to specific `gcc`/`g++` versions: - -```yaml -matrix: - include: - - os: osx - osx_image: xcode8 - env: - - MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9" - - - os: osx - osx_image: xcode8 - env: - - MATRIX_EVAL="brew install gcc5 && CC=gcc-5 && CXX=g++-5" - - - os: osx - osx_image: xcode8 - env: - - MATRIX_EVAL="brew install gcc6 && CC=gcc-6 && CXX=g++-6" - - - os: osx - osx_image: xcode8 - env: - - MATRIX_EVAL="brew install gcc && CC=gcc-7 && CXX=g++-7" - -before_install: - - eval "${MATRIX_EVAL}" -``` -{: data-file=".travis.yml"} - ### GCC on FreeBSD Travis CI FreeBSD image ships with GCC 10.0.0 (it's not in the base system by default). @@ -117,115 +81,36 @@ addons: ### Clang on Linux -* [Precise](/user/reference/precise/) ships with Clang 3.4 -* [Trusty](/user/reference/trusty/) ships with Clang 3.5.0 * [Xenial](/user/reference/xenial/) ships with Clang 7 -* [Bionic](/user/reference/bionic/) ships with Clang 7 - -Note that [C++11 support is complete starting from Clang 3.3](http://clang.llvm.org/cxx_status.html). +* [Bionic](/user/reference/bionic/) ships with Clang 18.1.8 +* [Focal](/user/reference/focal/) ships with Clang 18.1.8 +* [Jammy](/user/reference/jammy/) ships with Clang 18.1.8 +* [Noble](/user/reference/noble/) ships with Clang 18.1.3 -To upgrade Clang to a more recent version, you will have to install the appropriate version from a `llvm-toolchain-*` source (the `ubuntu-toolchain-r-test` source must also be pulled in for dependency resolution); see below for examples: +To upgrade Clang to a more recent version, it is necessary to install the appropriate version from a `llvm-toolchain-*` source (the `ubuntu-toolchain-r-test` source must also be pulled in for dependency resolution); see below for a Focal example: ```yaml matrix: include: - # works on Precise and Trusty - os: linux addons: apt: sources: - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.6 + - llvm-toolchain-focal-18 packages: - - clang-3.6 + - clang-18 env: - - MATRIX_EVAL="CC=clang-3.6 && CXX=clang++-3.6" - - # works on Precise and Trusty - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.7 - packages: - - clang-3.7 - env: - - MATRIX_EVAL="CC=clang-3.7 && CXX=clang++-3.7" - - # works on Precise and Trusty - - os: linux - addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-precise-3.8 - packages: - - clang-3.8 - env: - - MATRIX_EVAL="CC=clang-3.8 && CXX=clang++-3.8" - - # works on Trusty - - os: linux - addons: - apt: - sources: - - llvm-toolchain-trusty-3.9 - packages: - - clang-3.9 - env: - - MATRIX_EVAL="CC=clang-3.9 && CXX=clang++-3.9" - - # works on Trusty - - os: linux - addons: - apt: - sources: - - llvm-toolchain-trusty-4.0 - packages: - - clang-4.0 - env: - - MATRIX_EVAL="CC=clang-4.0 && CXX=clang++-4.0" - - # works on Trusty - - os: linux - addons: - apt: - sources: - - llvm-toolchain-trusty-5.0 - packages: - - clang-5.0 - env: - - MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0" - -before_install: - - eval "${MATRIX_EVAL}" -``` -{: data-file=".travis.yml"} - -### Clang on macOS - -On macOS, the version of `clang` is controlled by the choice of `osx_image`. -You can find [here](/user/reference/osx/#macos-version) the list of available `osx_image`. - -```yaml -matrix: -  include: -    - os: osx -      osx_image: xcode10.1 - - - os: osx -      osx_image: xcode9.4 + - MATRIX_EVAL="CC=clang-18 && CXX=clang++-18" ``` {: data-file=".travis.yml"} -You can find the `clang` version shipped by Xcode [here](https://trac.macports.org/wiki/XcodeVersionInfo). ### Clang on FreeBSD -> Clang is the default compiler on FreeBSD +> Clang is the default compiler on FreeBSD. -FreeBSD ships with Clang 8.0.1 +FreeBSD ships with Clang 8.0.1. To upgrade Clang to a more recent version, install the appropriate version from packages; see below for examples: @@ -240,27 +125,13 @@ addons: ``` {: data-file=".travis.yml"} -> Clang is the default compiler on FreeBSD +> Clang is the default compiler on FreeBSD. #### CMake -* [Precise](/user/reference/precise/) ships with CMake 2.8.7 -* [Trusty](/user/reference/trusty/) ships with CMake 3.9.2 -* [Xenial](/user/reference/xenial/) ships with CMake 3.12.4 -* [Bionic](/user/reference/bionic/) ships with CMake 3.12.4 +* [Bionic](/user/reference/bionic/) ships with CMake 3.26.3 +* [Focal](/user/reference/focal/) ships with Clang 4.2.0 +* [Jammy](/user/reference/jammy/) ships with Clang 4.2.0 +* [Noble](/user/reference/noble/) ships with Clang 4.1.2 * [FreeBSD](/user/reference/freebsd/) ships with CMake 3.15.5 -You can upgrade cmake to 3.2.3 on Precise from the `george-edison55-precise-backports` source (note that the `cmake-data` package contains dependencies which Aptitude does not automatically resolve), c.f. - -```yaml -addons: - apt: - sources: - - george-edison55-precise-backports - packages: - - cmake-data - - cmake -``` -{: data-file=".travis.yml"} - -On macOS, the version of `cmake` is controlled by the choice of `osx_image`. diff --git a/_includes/deploy/opt_in.md b/_includes/deploy/opt_in.md index bfff233cb43..acfecf12730 100644 --- a/_includes/deploy/opt_in.md +++ b/_includes/deploy/opt_in.md @@ -1,12 +1,30 @@ -## How to opt in to v2 +## How to opt in to different deployment tooling versions -In order to use version `v2` of our deployment tooling, please add the +In order to use different version of our deployment tooling, please add the following to your `.travis.yml`: ```yaml deploy: provider: # ⋮ + dpl_version: # Optional, defaults to the latest stable version +``` +if you want to use the latest edge version of the deployment tooling: + +```yaml +deploy: + provider: + # ⋮ + edge: true +``` +if you want to use other edge version of the deployment tooling: + +```yaml +deploy: + provider: + # ⋮ + dpl_version: edge: true ``` + {: data-file=".travis.yml"} diff --git a/_includes/deploy/providers/anynines.md b/_includes/deploy/providers/anynines.md index 5b111deb742..abd299f3265 100644 --- a/_includes/deploy/providers/anynines.md +++ b/_includes/deploy/providers/anynines.md @@ -43,4 +43,4 @@ All options can be given as environment variables if prefixed with `ANYNINES_`. For example, `password` can be given as `ANYNINES_PASSWORD=`. -{% include deploy/secrets.md name="password" env_name="ANYNINES_PASSWORD" %} \ No newline at end of file +{% include deploy/secrets.md name="password" env_name="ANYNINES_PASSWORD" %} diff --git a/_includes/deploy/providers/bintray.md b/_includes/deploy/providers/bintray.md index 54b26afced0..995dc7e00ee 100644 --- a/_includes/deploy/providers/bintray.md +++ b/_includes/deploy/providers/bintray.md @@ -18,7 +18,7 @@ deploy: ## Status -Support for deployments to Bintray is *stable**. +Support for deployments to Bintray is **stable**. ## Known options Use the following options to further configure the deployment. @@ -39,4 +39,4 @@ All options can be given as environment variables if prefixed with `BINTRAY_`. For example, `key` can be given as `BINTRAY_KEY=`. -{% include deploy/secrets.md name="key" env_name="BINTRAY_KEY" %} \ No newline at end of file +{% include deploy/secrets.md name="key" env_name="BINTRAY_KEY" %} diff --git a/_includes/deploy/providers/bluemixcloudfoundry.md b/_includes/deploy/providers/bluemixcloudfoundry.md index 03fcb9d95d8..3169a66aa56 100644 --- a/_includes/deploy/providers/bluemixcloudfoundry.md +++ b/_includes/deploy/providers/bluemixcloudfoundry.md @@ -19,7 +19,7 @@ deploy: ## Status -Support for deployments to Bluemix Cloud Foundry is *stable**. +Support for deployments to Bluemix Cloud Foundry is **stable**. ## Known options Use the following options to further configure the deployment. @@ -46,4 +46,4 @@ All options can be given as environment variables if prefixed with `CLOUDFOUNDRY For example, `password` can be given as `CLOUDFOUNDRY_PASSWORD=`. -{% include deploy/secrets.md name="password" env_name="CLOUDFOUNDRY_PASSWORD" %} \ No newline at end of file +{% include deploy/secrets.md name="password" env_name="CLOUDFOUNDRY_PASSWORD" %} diff --git a/_includes/deploy/providers/cargo.md b/_includes/deploy/providers/cargo.md index 7d2f622fdbe..d3809add71f 100644 --- a/_includes/deploy/providers/cargo.md +++ b/_includes/deploy/providers/cargo.md @@ -16,7 +16,7 @@ deploy: ## Status -Support for deployments to Cargo is *stable**. +Support for deployments to Cargo is **stable**. ## Known options Use the following options to further configure the deployment. @@ -35,4 +35,4 @@ All options can be given as environment variables if prefixed with `CARGO_`. For example, `token` can be given as `CARGO_TOKEN=`. -{% include deploy/secrets.md name="token" env_name="CARGO_TOKEN" %} \ No newline at end of file +{% include deploy/secrets.md name="token" env_name="CARGO_TOKEN" %} diff --git a/_includes/deploy/providers/cloudformation.md b/_includes/deploy/providers/cloudformation.md index c4bea1d1447..0d965061622 100644 --- a/_includes/deploy/providers/cloudformation.md +++ b/_includes/deploy/providers/cloudformation.md @@ -19,7 +19,7 @@ deploy: ## Status -Support for deployments to AWS CloudFormation is *stable**. +Support for deployments to AWS CloudFormation is **stable**. ## Known options Use the following options to further configure the deployment. @@ -49,9 +49,9 @@ Use the following options to further configure the deployment. All options can be given as environment variables if prefixed with `AWS_` or `CLOUDFORMATION_`. -For example, `access_key_id` can be given as +For example, `access_key_id` can be given as -* `AWS_ACCESS_KEY_ID=` or +* `AWS_ACCESS_KEY_ID=` or * `CLOUDFORMATION_ACCESS_KEY_ID=` -{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} \ No newline at end of file +{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} diff --git a/_includes/deploy/providers/cloudfoundry.md b/_includes/deploy/providers/cloudfoundry.md index 5aea989d037..02f962189b4 100644 --- a/_includes/deploy/providers/cloudfoundry.md +++ b/_includes/deploy/providers/cloudfoundry.md @@ -19,7 +19,7 @@ deploy: ## Status -Support for deployments to Cloud Foundry is *stable**. +Support for deployments to Cloud Foundry is **stable**. ## Known options Use the following options to further configure the deployment. @@ -47,4 +47,4 @@ All options can be given as environment variables if prefixed with `CLOUDFOUNDRY For example, `password` can be given as `CLOUDFOUNDRY_PASSWORD=`. -{% include deploy/secrets.md name="password" env_name="CLOUDFOUNDRY_PASSWORD" %} \ No newline at end of file +{% include deploy/secrets.md name="password" env_name="CLOUDFOUNDRY_PASSWORD" %} diff --git a/_includes/deploy/providers/codedeploy.md b/_includes/deploy/providers/codedeploy.md index b4152f7a72a..2fbcdb82256 100644 --- a/_includes/deploy/providers/codedeploy.md +++ b/_includes/deploy/providers/codedeploy.md @@ -18,7 +18,7 @@ deploy: ## Status -Support for deployments to AWS Code Deploy is *stable**. +Support for deployments to AWS Code Deploy is **stable**. ## Known options Use the following options to further configure the deployment. @@ -48,9 +48,9 @@ Use the following options to further configure the deployment. All options can be given as environment variables if prefixed with `AWS_` or `CODEDEPLOY_`. -For example, `access_key_id` can be given as +For example, `access_key_id` can be given as -* `AWS_ACCESS_KEY_ID=` or +* `AWS_ACCESS_KEY_ID=` or * `CODEDEPLOY_ACCESS_KEY_ID=` ## Interpolation variables @@ -86,4 +86,4 @@ For example: "Current build number: ${TRAVIS_BUILD_NUMBER}". See [here](/user/environment-variables/#default-environment-variables) for a list of default environment variables set. -{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} \ No newline at end of file +{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} diff --git a/_includes/deploy/providers/elasticbeanstalk.md b/_includes/deploy/providers/elasticbeanstalk.md index 795fb698da0..bf8dd54a596 100644 --- a/_includes/deploy/providers/elasticbeanstalk.md +++ b/_includes/deploy/providers/elasticbeanstalk.md @@ -18,7 +18,7 @@ deploy: ## Status -Support for deployments to AWS Elastic Beanstalk is *stable**. +Support for deployments to AWS Elastic Beanstalk is **stable**. ## Known options Use the following options to further configure the deployment. @@ -45,9 +45,9 @@ Use the following options to further configure the deployment. All options can be given as environment variables if prefixed with `AWS_` or `ELASTIC_BEANSTALK_`. -For example, `access_key_id` can be given as +For example, `access_key_id` can be given as -* `AWS_ACCESS_KEY_ID=` or +* `AWS_ACCESS_KEY_ID=` or * `ELASTIC_BEANSTALK_ACCESS_KEY_ID=` -{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} \ No newline at end of file +{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} diff --git a/_includes/deploy/providers/firebase.md b/_includes/deploy/providers/firebase.md index 4f3f2465f6e..d6b412961c9 100644 --- a/_includes/deploy/providers/firebase.md +++ b/_includes/deploy/providers/firebase.md @@ -16,7 +16,7 @@ deploy: ## Status -Support for deployments to Firebase is *stable**. +Support for deployments to Firebase is **stable**. ## Known options Use the following options to further configure the deployment. @@ -38,4 +38,4 @@ All options can be given as environment variables if prefixed with `FIREBASE_`. For example, `token` can be given as `FIREBASE_TOKEN=`. -{% include deploy/secrets.md name="token" env_name="FIREBASE_TOKEN" %} \ No newline at end of file +{% include deploy/secrets.md name="token" env_name="FIREBASE_TOKEN" %} diff --git a/_includes/deploy/providers/gae.md b/_includes/deploy/providers/gae.md index aafd000d8ed..93ba9235b45 100644 --- a/_includes/deploy/providers/gae.md +++ b/_includes/deploy/providers/gae.md @@ -16,7 +16,7 @@ deploy: ## Status -Support for deployments to Google App Engine is *stable**. +Support for deployments to Google App Engine is **stable**. ## Known options Use the following options to further configure the deployment. diff --git a/_includes/deploy/providers/gcs.md b/_includes/deploy/providers/gcs.md index 65d6deb77ff..6d6e5ec6d22 100644 --- a/_includes/deploy/providers/gcs.md +++ b/_includes/deploy/providers/gcs.md @@ -27,7 +27,7 @@ deploy: ## Status -Support for deployments to Google Cloud Store is *stable**. +Support for deployments to Google Cloud Store is **stable**. ## Known options Use the following options to further configure the deployment. Either `key_file` or `access_key_id` and `secret_access_key` are required. @@ -55,4 +55,4 @@ All options can be given as environment variables if prefixed with `GCS_`. For example, `access_key_id` can be given as `GCS_ACCESS_KEY_ID=`. -{% include deploy/secrets.md name="access_key_id" env_name="GCS_ACCESS_KEY_ID" %} \ No newline at end of file +{% include deploy/secrets.md name="access_key_id" env_name="GCS_ACCESS_KEY_ID" %} diff --git a/_includes/deploy/providers/heroku_api.md b/_includes/deploy/providers/heroku_api.md index e5cdbb95ee6..d7acd881a8b 100644 --- a/_includes/deploy/providers/heroku_api.md +++ b/_includes/deploy/providers/heroku_api.md @@ -16,7 +16,7 @@ deploy: ## Status -Support for deployments to Heroku API is *stable**. +Support for deployments to Heroku API is **stable**. ## Known options Use the following options to further configure the deployment. @@ -36,4 +36,4 @@ All options can be given as environment variables if prefixed with `HEROKU_`. For example, `api_key` can be given as `HEROKU_API_KEY=`. -{% include deploy/secrets.md name="api_key" env_name="HEROKU_API_KEY" %} \ No newline at end of file +{% include deploy/secrets.md name="api_key" env_name="HEROKU_API_KEY" %} diff --git a/_includes/deploy/providers/lambda.md b/_includes/deploy/providers/lambda.md index d8e5045abce..7b1d720b45e 100644 --- a/_includes/deploy/providers/lambda.md +++ b/_includes/deploy/providers/lambda.md @@ -18,7 +18,7 @@ deploy: ## Status -Support for deployments to AWS Lambda is *stable**. +Support for deployments to AWS Lambda is **stable**. ## Known options Use the following options to further configure the deployment. @@ -55,9 +55,9 @@ Use the following options to further configure the deployment. All options can be given as environment variables if prefixed with `AWS_` or `LAMBDA_`. -For example, `access_key_id` can be given as +For example, `access_key_id` can be given as -* `AWS_ACCESS_KEY_ID=` or +* `AWS_ACCESS_KEY_ID=` or * `LAMBDA_ACCESS_KEY_ID=` ## Interpolation variables @@ -93,4 +93,4 @@ For example: "Current build number: ${TRAVIS_BUILD_NUMBER}". See [here](/user/environment-variables/#default-environment-variables) for a list of default environment variables set. -{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} \ No newline at end of file +{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} diff --git a/_includes/deploy/providers/npm.md b/_includes/deploy/providers/npm.md index 6a45a813dac..c32c7a307e5 100644 --- a/_includes/deploy/providers/npm.md +++ b/_includes/deploy/providers/npm.md @@ -16,7 +16,7 @@ deploy: ## Status -Support for deployments to npm is *stable**. +Support for deployments to npm is **stable**. ## Known options Use the following options to further configure the deployment. @@ -42,4 +42,4 @@ All options can be given as environment variables if prefixed with `NPM_`. For example, `api_token` can be given as `NPM_API_TOKEN=`. -{% include deploy/secrets.md name="api_token" env_name="NPM_API_TOKEN" %} \ No newline at end of file +{% include deploy/secrets.md name="api_token" env_name="NPM_API_TOKEN" %} diff --git a/_includes/deploy/providers/openshift.md b/_includes/deploy/providers/openshift.md index b066ffdd4e0..550d9a44d21 100644 --- a/_includes/deploy/providers/openshift.md +++ b/_includes/deploy/providers/openshift.md @@ -18,7 +18,7 @@ deploy: ## Status -Support for deployments to OpenShift is *stable**. +Support for deployments to OpenShift is **stable**. ## Known options Use the following options to further configure the deployment. @@ -39,4 +39,4 @@ All options can be given as environment variables if prefixed with `OPENSHIFT_`. For example, `token` can be given as `OPENSHIFT_TOKEN=`. -{% include deploy/secrets.md name="token" env_name="OPENSHIFT_TOKEN" %} \ No newline at end of file +{% include deploy/secrets.md name="token" env_name="OPENSHIFT_TOKEN" %} diff --git a/_includes/deploy/providers/opsworks.md b/_includes/deploy/providers/opsworks.md index 52884fa8cc5..f25a64cfb71 100644 --- a/_includes/deploy/providers/opsworks.md +++ b/_includes/deploy/providers/opsworks.md @@ -18,7 +18,7 @@ deploy: ## Status -Support for deployments to AWS OpsWorks is *stable**. +Support for deployments to AWS OpsWorks is **stable**. ## Known options Use the following options to further configure the deployment. @@ -43,9 +43,9 @@ Use the following options to further configure the deployment. All options can be given as environment variables if prefixed with `AWS_` or `OPSWORKS_`. -For example, `access_key_id` can be given as +For example, `access_key_id` can be given as -* `AWS_ACCESS_KEY_ID=` or +* `AWS_ACCESS_KEY_ID=` or * `OPSWORKS_ACCESS_KEY_ID=` -{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} \ No newline at end of file +{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} diff --git a/_includes/deploy/providers/pages_git.md b/_includes/deploy/providers/pages_git.md index b2fa6b22c66..f39d2027440 100644 --- a/_includes/deploy/providers/pages_git.md +++ b/_includes/deploy/providers/pages_git.md @@ -24,7 +24,7 @@ deploy: ## Status -Support for deployments to GitHub Pages is *stable**. +Support for deployments to GitHub Pages is **stable**. ## Known options Use the following options to further configure the deployment. Either `token` or `deploy_key` are required. @@ -56,9 +56,9 @@ Use the following options to further configure the deployment. Either `token` or All options can be given as environment variables if prefixed with `GITHUB_` or `PAGES_`. -For example, `token` can be given as +For example, `token` can be given as -* `GITHUB_TOKEN=` or +* `GITHUB_TOKEN=` or * `PAGES_TOKEN=` ## Interpolation variables @@ -91,4 +91,4 @@ For example: "Current build number: ${TRAVIS_BUILD_NUMBER}". See [here](/user/environment-variables/#default-environment-variables) for a list of default environment variables set. -{% include deploy/secrets.md name="token" env_name="GITHUB_TOKEN" %} \ No newline at end of file +{% include deploy/secrets.md name="token" env_name="GITHUB_TOKEN" %} diff --git a/_includes/deploy/providers/pypi.md b/_includes/deploy/providers/pypi.md index 49cb9478df1..5140bd2d1a9 100644 --- a/_includes/deploy/providers/pypi.md +++ b/_includes/deploy/providers/pypi.md @@ -17,7 +17,7 @@ deploy: ## Status -Support for deployments to PyPI is *stable**. +Support for deployments to PyPI is **stable**. ## Known options Use the following options to further configure the deployment. @@ -46,4 +46,4 @@ All options can be given as environment variables if prefixed with `PYPI_`. For example, `password` can be given as `PYPI_PASSWORD=`. -{% include deploy/secrets.md name="password" env_name="PYPI_PASSWORD" %} \ No newline at end of file +{% include deploy/secrets.md name="password" env_name="PYPI_PASSWORD" %} diff --git a/_includes/deploy/providers/releases.md b/_includes/deploy/providers/releases.md index 115238b7d91..24c0b8e0506 100644 --- a/_includes/deploy/providers/releases.md +++ b/_includes/deploy/providers/releases.md @@ -25,7 +25,7 @@ deploy: ## Status -Support for deployments to GitHub Releases is *stable**. +Support for deployments to GitHub Releases is **stable**. ## Known options Use the following options to further configure the deployment. Either `token` or `username` and `password` are required. @@ -55,9 +55,9 @@ Use the following options to further configure the deployment. Either `token` or All options can be given as environment variables if prefixed with `GITHUB_` or `RELEASES_`. -For example, `token` can be given as +For example, `token` can be given as -* `GITHUB_TOKEN=` or +* `GITHUB_TOKEN=` or * `RELEASES_TOKEN=` -{% include deploy/secrets.md name="token" env_name="GITHUB_TOKEN" %} \ No newline at end of file +{% include deploy/secrets.md name="token" env_name="GITHUB_TOKEN" %} diff --git a/_includes/deploy/providers/rubygems.md b/_includes/deploy/providers/rubygems.md index 6cd276abc56..c8d41a71c81 100644 --- a/_includes/deploy/providers/rubygems.md +++ b/_includes/deploy/providers/rubygems.md @@ -25,7 +25,7 @@ deploy: ## Status -Support for deployments to Rubygems is *stable**. +Support for deployments to Rubygems is **stable**. ## Known options Use the following options to further configure the deployment. Either `api_key` or `username` and `password` are required. @@ -49,4 +49,4 @@ All options can be given as environment variables if prefixed with `RUBYGEMS_`. For example, `api_key` can be given as `RUBYGEMS_API_KEY=`. -{% include deploy/secrets.md name="api_key" env_name="RUBYGEMS_API_KEY" %} \ No newline at end of file +{% include deploy/secrets.md name="api_key" env_name="RUBYGEMS_API_KEY" %} diff --git a/_includes/deploy/providers/s3.md b/_includes/deploy/providers/s3.md index edbd1ffd3a6..2b169c12657 100644 --- a/_includes/deploy/providers/s3.md +++ b/_includes/deploy/providers/s3.md @@ -18,7 +18,7 @@ deploy: ## Status -Support for deployments to AWS S3 is *stable**. +Support for deployments to AWS S3 is **stable**. ## Known options Use the following options to further configure the deployment. @@ -54,9 +54,9 @@ Use the following options to further configure the deployment. All options can be given as environment variables if prefixed with `AWS_` or `S3_`. -For example, `access_key_id` can be given as +For example, `access_key_id` can be given as -* `AWS_ACCESS_KEY_ID=` or +* `AWS_ACCESS_KEY_ID=` or * `S3_ACCESS_KEY_ID=` -{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} \ No newline at end of file +{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} diff --git a/_includes/deploy/providers/script.md b/_includes/deploy/providers/script.md index 26b6fa47ed4..3ce13b59ad4 100644 --- a/_includes/deploy/providers/script.md +++ b/_includes/deploy/providers/script.md @@ -16,7 +16,7 @@ deploy: ## Status -Support for deployments to Script is *stable**. +Support for deployments to Script is **stable**. ## Known options Use the following options to further configure the deployment. diff --git a/_includes/deploy/providers/snap.md b/_includes/deploy/providers/snap.md index 3aa1637d95b..658053d94e9 100644 --- a/_includes/deploy/providers/snap.md +++ b/_includes/deploy/providers/snap.md @@ -16,7 +16,7 @@ deploy: ## Status -Support for deployments to Snap is *stable**. +Support for deployments to Snap is **stable**. ## Known options Use the following options to further configure the deployment. @@ -36,4 +36,4 @@ All options can be given as environment variables if prefixed with `SNAP_`. For example, `token` can be given as `SNAP_TOKEN=`. -{% include deploy/secrets.md name="token" env_name="SNAP_TOKEN" %} \ No newline at end of file +{% include deploy/secrets.md name="token" env_name="SNAP_TOKEN" %} diff --git a/_includes/deploy/providers/surge.md b/_includes/deploy/providers/surge.md index 92b7c435eb1..350f8da9f7d 100644 --- a/_includes/deploy/providers/surge.md +++ b/_includes/deploy/providers/surge.md @@ -17,7 +17,7 @@ deploy: ## Status -Support for deployments to Surge is *stable**. +Support for deployments to Surge is **stable**. ## Known options Use the following options to further configure the deployment. @@ -38,4 +38,4 @@ All options can be given as environment variables if prefixed with `SURGE_`. For example, `token` can be given as `SURGE_TOKEN=`. -{% include deploy/secrets.md name="token" env_name="SURGE_TOKEN" %} \ No newline at end of file +{% include deploy/secrets.md name="token" env_name="SURGE_TOKEN" %} diff --git a/_includes/enterprise_sidebar.html b/_includes/enterprise_sidebar.html index 31db71c48f4..7ccfae8142d 100644 --- a/_includes/enterprise_sidebar.html +++ b/_includes/enterprise_sidebar.html @@ -1,41 +1,14 @@ diff --git a/_includes/footer.html b/_includes/footer.html index c1adbc6ba1d..84b8561d217 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,10 +1,7 @@