diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000000..ccfd8320716 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,10 @@ +.dockerignore +.env +.env.* +.git +.gitignore +.travis.yml +Dockerfile +spec +#IDEs folders +.idea \ No newline at end of file diff --git a/.gitignore b/.gitignore index b1815cd33b2..96ddb289a57 100644 --- a/.gitignore +++ b/.gitignore @@ -1,16 +1,19 @@ .DS_Store .bundle +.history .jekyll-metadata .rvmrc .sass-cache *.sw[op] -# These files in _data are generated +# These files in _data are generated _data/*ip_range.yml _data/trusty*language*mapping* _data/node_js_versions.yml +_data/language-details/*-versions.yml +assets/javascripts/tablefilter _site -bin node_modules source/tmp/* tmp/ api/ +user/notifications.md diff --git a/.ruby-version b/.ruby-version index 35cee72dcbf..4560fb912c0 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.3 +ruby-2.6.3 diff --git a/.travis.yml b/.travis.yml index bcb3631cb3a..3c196e11bf7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,34 +1,61 @@ #language: ruby -dist: trusty -language: python -python: - - "3.5.2" +dist: bionic + branches: only: - master -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: - - libxml2-utils -deploy: - provider: heroku - api_key: - secure: "hylw2GIHMvZKOKX3uPSaLEzVrUGEA9mzGEA0s4zK37W9HJCTnvAcmgRCwOkRuC4L7R4Zshdh/CGORNnBBgh1xx5JGYwkdnqtjHuUQmWEXCusrIURu/iEBNSsZZEPK7zBuwqMHj2yRm64JfbTDJsku3xdoA5Z8XJG5AMJGKLFgUQ=" - app: docs-travis-ci-com - skip_cleanup: true - on: - branch: - - master + +jobs: + include: + - name: build site + language: python + python: + - "3.8.3" + 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: + - libxml2-utils + install: + - rvm use 2.6.3 --install + - 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 + + - name: update dpl v2 docs + if: type = cron || commit_message =~ /ci:dpl/ + language: shell + cache: false + install: + - rvm use 3.3.1 --install + script: + - git clone https://github.com/travis-ci/dpl.git + - cd dpl + - gem build dpl.gemspec + - gem install dpl-*.gem + - cd .. + - rm -rf dpl + - bin/dpl + deploy: + - provider: git_push + token: + secure: "YHuTjIGKpG0A8QJ4kmdLfOW1n+62uLakXv0KjCzWExl22qLSn2frip3j8JsaeMfndsmNZBUfGoONVHvDS+PHnkbRMYf21SjgctpVfHRYZQ3pulexOViEQ6azRgCBWuPO8A+vAyxvjlV4e3UDGnt2x/0X/Tdg9iVf/zzBGjM0YX0=" + branch: auto-dpl-v2-update-docs + pull_request: true + edge: + branch: master + notifications: slack: rooms: @@ -36,11 +63,3 @@ notifications: on_success: never webhooks: 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 diff --git a/404.html b/404.html index 6fba736fcd6..bd8e63f644e 100644 --- a/404.html +++ b/404.html @@ -3,6 +3,14 @@
+ + + +