Skip to content

Commit fd56d4f

Browse files
authored
Merge branch 'master' into ph-language-review-lifecycle
2 parents 99243b3 + 58ed76b commit fd56d4f

File tree

217 files changed

+6451
-317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

217 files changed

+6451
-317
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
.rvmrc
55
.sass-cache
66
*.sw[op]
7-
# These files in _data are generated
7+
# These files in _data are generated
88
_data/*ip_range.yml
99
_data/trusty*language*mapping*
1010
_data/node_js_versions.yml
11+
_data/language-details/*-versions.yml
12+
assets/javascripts/tablefilter
1113
_site
1214
bin
1315
node_modules

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#language: ruby
2-
dist: trusty
2+
dist: xenial
33
language: python
44
python:
55
- "3.5.2"
@@ -25,10 +25,10 @@ deploy:
2525
api_key:
2626
secure: "hylw2GIHMvZKOKX3uPSaLEzVrUGEA9mzGEA0s4zK37W9HJCTnvAcmgRCwOkRuC4L7R4Zshdh/CGORNnBBgh1xx5JGYwkdnqtjHuUQmWEXCusrIURu/iEBNSsZZEPK7zBuwqMHj2yRm64JfbTDJsku3xdoA5Z8XJG5AMJGKLFgUQ="
2727
app: docs-travis-ci-com
28-
skip_cleanup: true
2928
on:
3029
branch:
3130
- master
31+
edge: true
3232
notifications:
3333
slack:
3434
rooms:

Gemfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,10 @@ gem 'therubyracer', :platforms => :ruby
4343
git 'https://github.com/ably-forks/compass', branch: 'sass-deprecation-warning-fix', ref: '3861c9d' do
4444
gem 'compass-core'
4545
end
46+
47+
group :dpl do
48+
gem 'dpl', git: 'https://github.com/travis-ci/dpl'
49+
gem 'cl'
50+
end
51+
52+
gem 'netrc'

Gemfile.lock

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,23 @@ GIT
1717
compass-import-once (1.0.5)
1818
sass (>= 3.2, < 3.5)
1919

20+
GIT
21+
remote: https://github.com/travis-ci/dpl
22+
revision: d64f2644207666a56e39c071f3a9d26b7e56b2ab
23+
specs:
24+
dpl (2.0.0.alpha.9)
25+
cl (~> 1.0)
26+
2027
GEM
2128
remote: https://rubygems.org/
2229
specs:
23-
activesupport (4.2.11)
30+
activesupport (4.2.11.1)
2431
i18n (~> 0.7)
2532
minitest (~> 5.1)
2633
thread_safe (~> 0.3, >= 0.3.4)
2734
tzinfo (~> 1.1)
28-
addressable (2.5.2)
29-
public_suffix (>= 2.0.2, < 4.0)
35+
addressable (2.7.0)
36+
public_suffix (>= 2.0.2, < 5.0)
3037
ast (2.4.0)
3138
capybara (2.4.4)
3239
mime-types (>= 1.16)
@@ -35,38 +42,39 @@ GEM
3542
rack-test (>= 0.5.4)
3643
xpath (~> 2.0)
3744
chunky_png (1.3.10)
45+
cl (1.1.5)
46+
regstry (~> 1.0.3)
3847
coderay (1.1.2)
3948
coffee-script (2.4.1)
4049
coffee-script-source
4150
execjs
4251
coffee-script-source (1.12.2)
4352
colorator (1.1.0)
44-
colorize (0.8.1)
4553
em-websocket (0.5.1)
4654
eventmachine (>= 0.12.9)
4755
http_parser.rb (~> 0.6.0)
4856
erubis (2.7.0)
49-
ethon (0.11.0)
57+
ethon (0.12.0)
5058
ffi (>= 1.3.0)
5159
eventmachine (1.2.7)
5260
execjs (2.7.0)
5361
faraday (0.15.2)
5462
multipart-post (>= 1.2, < 3)
55-
ffi (1.9.25)
63+
ffi (1.11.1)
5664
forwardable-extended (2.6.0)
5765
haml (5.0.4)
5866
temple (>= 0.8.0)
5967
tilt
6068
hike (1.2.3)
6169
hooks (0.4.1)
6270
uber (~> 0.0.14)
63-
html-proofer (3.9.3)
64-
activesupport (>= 4.2, < 6.0)
71+
html-proofer (3.12.0)
6572
addressable (~> 2.3)
66-
colorize (~> 0.8)
67-
mercenary (~> 0.3.2)
68-
nokogiri (~> 1.8.1)
73+
mercenary (~> 0.3)
74+
nokogiri (~> 1.10)
6975
parallel (~> 1.3)
76+
rainbow (~> 3.0)
77+
timerizer (~> 0.3)
7078
typhoeus (~> 1.3)
7179
yell (~> 2.0)
7280
http_parser.rb (0.6.0)
@@ -141,19 +149,20 @@ GEM
141149
mime-types (3.1)
142150
mime-types-data (~> 3.2015)
143151
mime-types-data (3.2016.0521)
144-
mini_portile2 (2.3.0)
152+
mini_portile2 (2.4.0)
145153
minitest (5.11.3)
146154
multi_json (1.13.1)
147155
multipart-post (2.0.0)
148-
nokogiri (1.8.5)
149-
mini_portile2 (~> 2.3.0)
156+
netrc (0.11.0)
157+
nokogiri (1.10.4)
158+
mini_portile2 (~> 2.4.0)
150159
padrino-helpers (0.12.9)
151160
i18n (~> 0.6, >= 0.6.7)
152161
padrino-support (= 0.12.9)
153162
tilt (>= 1.4.1, < 3)
154163
padrino-support (0.12.9)
155164
activesupport (>= 3.1)
156-
parallel (1.12.1)
165+
parallel (1.17.0)
157166
parser (2.5.1.0)
158167
ast (~> 2.4.0)
159168
pathutil (0.16.1)
@@ -162,7 +171,7 @@ GEM
162171
pry (0.11.3)
163172
coderay (~> 1.1.0)
164173
method_source (~> 0.9.0)
165-
public_suffix (3.0.3)
174+
public_suffix (4.0.1)
166175
puma (3.11.4)
167176
rack (1.6.11)
168177
rack-jekyll (0.5.0)
@@ -182,6 +191,7 @@ GEM
182191
rdiscount (2.2.0.1)
183192
redcarpet (3.4.0)
184193
ref (2.0.0)
194+
regstry (1.0.14)
185195
rouge (2.2.1)
186196
rubocop (0.57.2)
187197
jaro_winkler (~> 1.5.1)
@@ -212,6 +222,7 @@ GEM
212222
thor (0.20.0)
213223
thread_safe (0.3.6)
214224
tilt (1.4.1)
225+
timerizer (0.3.2)
215226
typhoeus (1.3.1)
216227
ethon (>= 0.9.0)
217228
tzinfo (1.2.5)
@@ -223,13 +234,15 @@ GEM
223234
unicode-display_width (1.4.0)
224235
xpath (2.1.0)
225236
nokogiri (~> 1.3)
226-
yell (2.0.7)
237+
yell (2.2.0)
227238

228239
PLATFORMS
229240
ruby
230241

231242
DEPENDENCIES
243+
cl
232244
compass-core!
245+
dpl!
233246
faraday
234247
html-proofer (~> 3.0)
235248
jekyll (>= 3.1.6)
@@ -239,6 +252,7 @@ DEPENDENCIES
239252
middleman-gh-pages
240253
middleman-livereload
241254
middleman-syntax
255+
netrc
242256
pry
243257
puma
244258
rack-jekyll

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 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)
1+
# 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)
22

33
This is the documentation site for Travis CI! (<https://docs.travis-ci.com/>)
44

@@ -9,7 +9,7 @@ Once you're done with your changes send a pull request. Thanks!
99

1010
## How to check your edit before sending PR
1111

12-
You can inspect how your edits will be reflected by the documentation site.
12+
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.
1313

1414
### Install dependencies
1515

Rakefile

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ abort('Please run this using `bundle exec rake`') unless ENV["BUNDLE_BIN_PATH"]
66
require 'ipaddr'
77
require 'json'
88
require 'yaml'
9+
require 'netrc'
910

1011
require 'faraday'
1112
require 'html-proofer'
@@ -40,7 +41,7 @@ desc 'Runs the tests!'
4041
task test: %i[build run_html_proofer]
4142

4243
desc 'Builds the site (Jekyll and Slate)'
43-
task build: %i[regen make_api] do
44+
task build: %i[regen make_api update_lang_vers] do
4445
rm_f '.jekyll-metadata'
4546
sh 'bundle exec jekyll build --config=_config.yml'
4647
end
@@ -125,7 +126,7 @@ task regen: (%i[clean] + %w[
125126
_data/linux_containers_ip_range.yml
126127
_data/macstadium_ip_range.yml
127128
_data/node_js_versions.yml
128-
])
129+
] + %i[update_lang_vers])
129130

130131
desc 'Remove generated files'
131132
task :clean do
@@ -136,7 +137,9 @@ task :clean do
136137
_data/linux_containers_ip_range.yml
137138
_data/macstadium_ip_range.yml
138139
_data/node_js_versions.yml
140+
_data/language-details/*-versions.yml
139141
])
142+
rm_rf('assets/javascripts/tablefilter')
140143
rm_rf('_site')
141144
rm_rf('api/*')
142145
end
@@ -154,3 +157,33 @@ desc 'make API docs'
154157
task :make_api do
155158
sh 'bundle exec middleman build --clean'
156159
end
160+
161+
LANG_ARCHIVE_HOST='language-archives.travis-ci.com'
162+
TABLEFILTER_SOURCE_PATH='assets/javascripts/tablefilter/dist/tablefilter/tablefilter.js'
163+
164+
desc 'update language archive versions'
165+
task :update_lang_vers => [:write_netrc, TABLEFILTER_SOURCE_PATH] do
166+
unless ENV.key?('ARCHIVE_USER') && ENV.key?("ARCHIVE_PASSWORD")
167+
puts "No credentials given. Not updating language versions data."
168+
next
169+
end
170+
definitions = YAML.load_file('_data/language-details/archive_definitions.yml')
171+
definitions.each do |lang, defs|
172+
sh "curl", "-sSf", "--netrc",
173+
"-H \"Accept: application/x-yaml\"",
174+
"https://#{LANG_ARCHIVE_HOST}/builds/#{lang}/#{defs.fetch("prefix","ubuntu")}",
175+
:out => "_data/language-details/#{lang}-versions.yml"
176+
end
177+
end
178+
179+
desc 'Write lang archive credentials'
180+
task :write_netrc do
181+
n = Netrc.read
182+
n[LANG_ARCHIVE_HOST] = ENV["ARCHIVE_USER"], ENV["ARCHIVE_PASSWORD"]
183+
n.save
184+
end
185+
186+
desc "Add TableFilter"
187+
file TABLEFILTER_SOURCE_PATH do
188+
sh "git", "clone", "--depth=1", "https://github.com/koalyptus/TableFilter.git", "assets/javascripts/tablefilter"
189+
end

_data/deployments_v2.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
anynines: "/user/deployment-v2/providers/anynines/"
2+
AWS CloudFormation: "/user/deployment-v2/providers/cloudformation/"
3+
AWS CodeDeploy: "/user/deployment-v2/providers/codedeploy/"
4+
AWS Elastic Beanstalk: "/user/deployment-v2/providers/elasticbeanstalk/"
5+
AWS Lambda: "/user/deployment-v2/providers/lambda/"
6+
AWS OpsWorks: "/user/deployment-v2/providers/opsworks/"
7+
AWS S3: "/user/deployment-v2/providers/s3/"
8+
Azure Web Apps: "/user/deployment-v2/providers/azure-web-apps/"
9+
Bintray: "/user/deployment-v2/providers/bintray/"
10+
Bluemix CloudFoundry: "/user/deployment-v2/providers/bluemixcloudfoundry/"
11+
Boxfuse: "/user/deployment-v2/providers/boxfuse/"
12+
Cargo: "/user/deployment-v2/providers/cargo/"
13+
Chef Supermarket: "/user/deployment-v2/providers/chefsupermarket/"
14+
Cloud 66: "/user/deployment-v2/providers/cloud66/"
15+
Cloud Foundry: "/user/deployment-v2/providers/cloudfoundry/"
16+
Convox: "/user/deployment-v2/providers/convox/"
17+
Datica: "/user/deployment-v2/providers/datica/"
18+
Engine Yard: "/user/deployment-v2/providers/engineyard/"
19+
GitHub Pages: "/user/deployment-v2/providers/pages/"
20+
GitHub Releases: "/user/deployment-v2/providers/releases/"
21+
Gleis: "/user/deployment-v2/providers/gleis/"
22+
Google App Engine: "/user/deployment-v2/providers/google-app-engine/"
23+
Google Cloud Storage: "/user/deployment-v2/providers/gcs/"
24+
Google Firebase: "/user/deployment-v2/providers/firebase/"
25+
Hackage: "/user/deployment-v2/providers/hackage/"
26+
Hephy: "/user/deployment-v2/providers/hephy/"
27+
Heroku: "/user/deployment-v2/providers/heroku/"
28+
Launchpad: "/user/deployment-v2/providers/launchpad/"
29+
NPM: "/user/deployment-v2/providers/npm/"
30+
Netlify Drop: "/user/deployment-v2/providers/netlify/"
31+
OpenShift: "/user/deployment-v2/providers/openshift/"
32+
packagecloud: "/user/deployment-v2/providers/packagecloud/"
33+
Puppet Forge: "/user/deployment-v2/providers/puppetforge/"
34+
PyPI: "/user/deployment-v2/providers/pypi/"
35+
Rackspace Cloud Files: "/user/deployment-v2/providers/cloudfiles/"
36+
RubyGems: "/user/deployment-v2/providers/rubygems/"
37+
Scalingo: "/user/deployment-v2/providers/scalingo/"
38+
Script: "/user/deployment-v2/providers/script/"
39+
Snap Store: "/user/deployment-v2/providers/snap/"
40+
Surge.sh: "/user/deployment-v2/providers/surge/"
41+
TestFairy: "/user/deployment-v2/providers/testfairy/"
42+
Transifex: "/user/deployment-v2/providers/transifex/"
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
python: {}
2+
erlang: {}

0 commit comments

Comments
 (0)