Skip to content

Commit ef2e751

Browse files
plaindocsplaindocs
authored
Merge branch 'master' into patch-1
2 parents 83688bf + 35bb782 commit ef2e751

Some content is hidden

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

65 files changed

+1415
-179
lines changed

‎_data/databases.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ Riak: "#Riak"
1010
RabbitMQ: "#RabbitMQ"
1111
Memcached: "#Memcached"
1212
Cassandra: "#Cassandra"
13-
Neo4J: "#Neo4J"
13+
Neo4j: "#Neo4j"
1414
ElasticSearch: "#ElasticSearch"

‎_data/dpl.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
s3: |
2+
3+
4+
* **access-key-id**: AWS Access Key ID. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
5+
* **secret-access-key**: AWS Secret Key. Can be obtained from [here](https://console.aws.amazon.com/iam/home?#security_credential).
6+
* **bucket**: S3 Bucket.
7+
* **region**: S3 Region. Defaults to us-east-1.
8+
* **upload-dir**: S3 directory to upload to. Defaults to root directory.
9+
* **storage-class**: S3 storage class to upload as. Defaults to "STANDARD". Other values are "STANDARD_IA" or "REDUCED_REDUNDANCY". Details can be found [here](https://aws.amazon.com/s3/storage-classes/).
10+
* **server-side-encryption**: When set to `true`, use S3 Server Side Encryption (SSE-AES256). Defaults to `false`.
11+
* **local-dir**: Local directory to upload from. Can be set from a global perspective (~/travis/build) or relative perspective (build) Defaults to project root.
12+
* **detect-encoding**: Set HTTP header `Content-Encoding` for files compressed with `gzip` and `compress` utilities. Defaults to not set.
13+
* **cache_control**: Set HTTP header `Cache-Control` to suggest that the browser cache the file. Defaults to `no-cache`. Valid options are `no-cache`, `no-store`, `max-age=<seconds>`,`s-maxage=<seconds>` `no-transform`, `public`, `private`.
14+
* **expires**: This sets the date and time that the cached object is no longer cacheable. Defaults to not set. The date must be in the format `YYYY-MM-DD HH:MM:SS -ZONE`.
15+
* **acl**: Sets the access control for the uploaded objects. Defaults to `private`. Valid options are `private`, `public_read`, `public_read_write`, `authenticated_read`, `bucket_owner_read`, `bucket_owner_full_control`.
16+
* **dot_match**: When set to `true`, upload files starting a `.`.
17+
* **index_document_suffix**: Set the index document of a S3 website.
18+
* **default_text_charset**: Set the default character set to append to the content-type of text files you are uploading.
19+
heroku: |

‎_data/enterprise.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
System Prerequisites: "/user/enterprise/prerequisites/"
2+
Installation: "/user/enterprise/installation/"
3+
Upgrading: "/user/enterprise/upgrading/"
4+
Customizing Build Images: "/user/enterprise/build-images/"
5+
Worker Configuration: "/user/enterprise/worker-configuration/"
6+
Worker Start & Debug Containers: "/user/enterprise/worker-cli-commands/"
7+
Platform Administration Tips: "/user/enterprise/platform-tips/"
8+
Trusty Build Containers (BETA): "/user/enterprise/trusty/"

‎_data/xcodes.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,46 @@
11
osx_images:
2+
- image: xcode9.1
3+
xcode: "9.1"
4+
osx_version: "10.12"
5+
xcode_full_version: "9.1"
6+
image_publish_date: 2017-10-04
7+
sdks:
8+
- macosx10.13
9+
- iphoneos11.1
10+
- iphonesimulator11.1
11+
- appletvos11.1
12+
- appletvsimulator11.1
13+
- watchos4.1
14+
- watchsimulator4.1
15+
simulators:
16+
- iOS 8.1
17+
- iOS 8.2
18+
- iOS 8.3
19+
- iOS 8.4
20+
- iOS 9.0
21+
- iOS 9.1
22+
- iOS 9.2
23+
- iOS 9.3
24+
- iOS 10.0
25+
- iOS 10.1
26+
- iOS 10.2
27+
- iOS 10.3
28+
- iOS 11.0
29+
- iOS 11.1
30+
- tvOS 9.0
31+
- tvOS 9.1
32+
- tvOS 9.2
33+
- tvOS 10.0
34+
- tvOS 10.1
35+
- tvOS 10.2
36+
- tvOS 11.0
37+
- tvOS 11.1
38+
- watchOS 2.0
39+
- watchOS 2.1
40+
- watchOS 2.2
41+
- watchOS 3.2
42+
- watchOS 4.0
43+
- watchOS 4.1
244
- image: xcode9
345
xcode: "9.0"
446
osx_version: "10.12"

‎_includes/c11-cpp11-and-beyond-and-toolchains.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ matrix:
5555
packages:
5656
- g++-7
5757
env:
58-
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
58+
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
5959

6060
before_install:
6161
- eval "${MATRIX_EVAL}"

‎_includes/enterprise_sidebar.html

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
<div id="sidebar" class="sidebar">
2+
<div>
3+
<!-- <h2>Search</h2> -->
4+
<div class="searchbox">
5+
<form>
6+
<input type="text" id="st-search-input" class="searchbox-input" placeholder="Search the docs" />
7+
</form>
8+
<script type="text/javascript">
9+
var Swiftype = window.Swiftype || {};
10+
(function() {
11+
Swiftype.key = 'tXvDDzd4fNTBnLvxfEyx';
12+
13+
Swiftype.searchSearchFields = {
14+
"page": ["title, body, tags"]
15+
};
16+
Swiftype.autocompleteSearchFields = {
17+
"page": ["title, body, tags"]
18+
};
19+
/** DO NOT EDIT BELOW THIS LINE **/
20+
var script = document.createElement('script'); script.type = 'text/javascript'; script.async = true;
21+
script.src = "//swiftype.com/embed.js";
22+
var entry = document.getElementsByTagName('script')[0];
23+
document.getElementsByTagName('script')[0].parentNode.insertBefore(script, entry);
24+
}());
25+
</script>
26+
</div>
27+
</div>
28+
29+
<section class="sidebar-navigation">
30+
<nav>
31+
<h3>Travis CI Enterprise</h3>
32+
<ul>
33+
<li><a href="/user/enterprise/">About Travis CI Enterprise</a></li>
34+
{% for enterprise in site.data.enterprise %}
35+
<li><a href="{{enterprise[1]}}">{{enterprise[0]}}</a></li>
36+
{% endfor %}
37+
</ul>
38+
<h3>Travis CI Docs</h3>
39+
<ul>
40+
<li><a href="/">Travis CI Docs</a></li>
41+
</ul>
42+
</nav>
43+
</section>
44+
45+
<section class="sidebar-notice">
46+
<p>This documentation site is open source.
47+
The <a href="https://github.com/travis-ci/docs-travis-ci-com">README in our Git repository</a> explains how to contribute.</p>
48+
</section>
49+
50+
</div><!-- /#sidebar -->

‎_includes/sidebar.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ <h3>CI Environment Reference</h3>
7979
<li><a href="/user/reference/osx/">OS X CI Environment Reference</a></li>
8080
<li><a href="/user/multi-os/">Building on Multiple Operating Systems</a></li>
8181
<li><a href="/user/environment-variables/">Environment Variables</a></li>
82-
<li><a href="/user/migrating-from-legacy/">Migrating to Container-Based Infrastructure</a></li>
8382
<li><a href="/user/precise-to-trusty-migration-guide/">Precise to Trusty Migration Guide</a></li>
8483
<li><a href="/user/build-environment-updates/">Build Environment Updates</a></li>
8584
</ul>
@@ -95,6 +94,7 @@ <h3>Encrypting Files and Data</h3>
9594
<h3>Beta Features</h3>
9695
<ul>
9796
<li><a href="/user/build-stages/">Build Stages</a></li>
97+
<li><a href="/user/conditional-builds-stages-jobs/">Conditional Builds, Stages, and Jobs</a></li>
9898
</ul>
9999

100100
<h3>Integrations and Notifications</h3>
@@ -125,6 +125,10 @@ <h3>3rd Party Tools and Resources</h3>
125125
<li><a href="/user/apps/">Apps, Clients and Tools</a></li>
126126
<li><a href="https://scan.coverity.com/travis_ci">Coverity Scan</a></li>
127127
</ul>
128+
<h3>Travis CI Enterprise</h3>
129+
<ul>
130+
<li><a href="/user/enterprise/">Enterprise Docs</a></li>
131+
</ul>
128132
</nav>
129133
</section>
130134

‎_layouts/en_enterprise.html

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!DOCTYPE HTML>
2+
<html lang="en">
3+
<head>
4+
{% include head.html %}
5+
</head>
6+
<body>
7+
<div class="wrapper">
8+
9+
{% include header.html %}
10+
11+
<div id="content" class="row">
12+
13+
{% include enterprise_sidebar.html %}
14+
15+
<main id="main" class="main" data-swiftype-index='true'>
16+
{% unless page.no_header %}
17+
<aside class="improve-page"><a href="{{ site.docs_github }}edit/master/{{ page.path }}" target="_blank" title="Edit this page on GitHub" class="button-pen" data-proofer-ignore>Improve this page on GitHub</a></aside>
18+
<h1 class="title">{{ page.title }}</h1>
19+
{% endunless %}
20+
{{ content }}
21+
</main>
22+
</div><!-- /#content -->
23+
24+
{% include footer.html %}
25+
</div><!-- /.wrapper -->
26+
</body>
27+
</html>

‎images/admin_only_toggle.png

14.2 KB
Loading

‎images/anika-hs.png

-291 KB
Binary file not shown.

‎images/apps/chroma-feedback.jpg

7.48 KB
Loading

‎images/apps/emacs.jpg

10.9 KB
Loading

‎images/atom_feed_add.png

-48.4 KB
Binary file not shown.

‎images/atom_feed_view.png

-141 KB
Binary file not shown.

‎images/autocancellation.png

38.5 KB
Loading

‎images/awesome_customers.jpg

-109 KB
Binary file not shown.

‎images/bluebox.png

-1.79 KB
Binary file not shown.

‎images/blueboxteam-small.png

-181 KB
Binary file not shown.

‎images/blueboxteam.png

-895 KB
Binary file not shown.

‎images/caches-item.png

19.2 KB
Loading

‎images/cli-cache.png

7.57 KB
Loading

‎images/cloudcontrol.png

-4.48 KB
Binary file not shown.

‎user/apps.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,15 @@ By Gleb Bahmutov
321321

322322
- [website](https://github.com/bahmutov/status-gravatar)
323323

324+
### Chroma Feedback
325+
326+
![chroma feedback](/images/apps/chroma-feedback.jpg){:.app}
327+
328+
Turn your Razer keyboard, mouse or headphone into a extreme feedback device<br>
329+
By Henry Ruhs
330+
331+
- [website](https://github.com/redaxmedia/chroma-feedback)
332+
324333
## Generators
325334

326335
### travis-encrypt
@@ -443,6 +452,16 @@ By Cas du Plessis
443452

444453
- [website](https://github.com/AgileAce/Brackets-TravisCI)
445454

455+
### Emacs Package
456+
457+
![emacs](/images/apps/emacs.jpg){:.app}
458+
459+
Travis CI integration for [Emacs](http://https://www.gnu.org/software/emacs/)<br>
460+
By Skye Shaw
461+
462+
- [website](https://github.com/sshaw/build-status)
463+
464+
446465
### Vim Plugin
447466

448467
![vim](/images/apps/vim.jpg){:.app}

‎user/build-environment-updates.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ layout: en
1010
> issue](https://github.com/travis-ci/travis-ci/issues).
1111
1212
<ul class="list--links">
13-
{% for page in site.pages %}
13+
{% assign reverse_pages = site.pages | reverse %}
14+
{% for page in reverse_pages %}
1415
{% if page.category == 'build_env_updates' %}
1516
<li><a href="{{ page.url }}" title="{{ page.title }}">{{ page.url | remove:'/user/build-environment-updates/' | remove: '/' }}</a></li>
1617
{% endif %}

‎user/build-environment-updates/2017-11-01.md

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
---
2+
title: Build Environment Update History
3+
layout: en
4+
permalink: /user/build-environment-updates/2017-11-01/
5+
category: build_env_updates
6+
date: 2017-11-01
7+
---
8+
9+
## 2017-11-01
10+
11+
This update applies to macos10.12-xcode8.3 image, for `os: osx` builds
12+
13+
### Schedule
14+
15+
[2017-11-01 22:30 UTC](http://everytimezone.com/#2017-11-01,630,c8l)
16+
17+
### Added
18+
19+
20+
21+
### Changed
22+
23+
- Bundler version `1.15.4`
24+
- xctool version `0.3.3`
25+
- Darwin Kernel Version `16.7.0`
26+
- automake `1.15.1`
27+
- boost `1.65.1`
28+
- carthage `0.26.0`
29+
- cgal `4.11`
30+
- cmake `3.9.4`
31+
- coreutils `8.28_1`
32+
- freexl `1.0.4`
33+
- gdal `1.11.5_3`
34+
- geos `3.6.2`
35+
- git `2.14.2`
36+
- gnupg `2.2.1`
37+
- gnutls `3.5.15`
38+
- go `1.9.1`
39+
- icu4c `59.1`
40+
- jpeg `9b`
41+
- json-c `0.12.1`
42+
- libgcrypt `1.8.1`
43+
- libgeotiff `1.4.2_1`
44+
- libpng `1.6.34`
45+
- libtiff `4.0.8_4`
46+
- libxml2 `2.9.6`
47+
- lzlib `1.9`
48+
- mercurial `4.3.3`
49+
- mpfr `3.1.6`
50+
- msgpack `2.1.5`
51+
- p11-kit `0.23.9`
52+
- node `8.6.0`
53+
- motion version `5.3`
54+
- pod version `1.3.1`
55+
- postgis `2.4.0`
56+
- postgresql `9.6.5`
57+
- pyenv `1.1.5`
58+
- python `2.7.14`
59+
- swiftlint `0.23.1`
60+
61+
62+
### Deprecated
63+
64+
N/A
65+
66+
67+
### Removed
68+
69+
N/A
70+
71+
### Fixed
72+
73+
N/A
74+
75+
### Security
76+
77+
- All brew packages updated to include latest security patches.
78+
79+
### Details
80+
81+
- [xcode8.3 diff](https://github.com/Lyoness/travis_staging_test/commit/fba03279686a1492a78ed958d72344fe4af3a55f?diff=unified#diff-934df722cbc32c134935cba6c22c3a84R740)
82+
-
83+

‎user/build-feeds.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The feeds are fetched directly from our API at `https://api.travis-ci.org`.
1818
The canonical URL for a repository's builds is:
1919

2020
```
21-
https://api.travis-ci.org/repos/travis-ci/travis-ci/builds`
21+
https://api.travis-ci.org/repos/travis-ci/travis-ci/builds
2222
```
2323

2424
This URL returns a JSON representation by default, but you can get the Atom feed by adding the `.atom` suffix:

‎user/conditional-builds-stages-jobs.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,23 +98,28 @@ The left hand side part can either be a known attribute or a function call.
9898
Known attributes are:
9999

100100
* `type` (the current event type, known event types are: `push`, `pull_request`, `api`, `cron`)
101+
* `repo` (the current repository slug `owner_name/name`)
101102
* `branch` (the current branch name)
102103
* `tag` (the current tag name)
103104
* `sender` (the event sender's login name)
105+
* `fork` (`true` or `false` depending if the repository is a fork)
106+
* `head_repo` (for pull requests: the head repository slug `owner_name/name`)
107+
* `head_branch` (for pull requests: the head repository branch name)
104108

105109
Known functions are:
106110

107111
* `env(FOO)` (the value of the environment variable `FOO`)
108112

109113
The function `env` currently only supports environment variables that are given in your build configuration (e.g. on `env` or `env.global`), not environment variables specified in your repository settings.
110114

111-
#### Equality
115+
#### Equality and inequality
112116

113117
This matches a string literally:
114118

115119
```
116120
branch = master
117121
env(foo) = bar
122+
sender != my-bot
118123
```
119124

120125
#### Match

‎user/coveralls.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ If you're using Coveralls with Travis CI for private repositories, edit `.covera
5959
```yaml
6060
service_name: travis-pro
6161
```
62-
{: data-file=".travis.yml"}
62+
{: data-file=".coveralls.yml"}
6363
6464
## Using Coveralls with other languages
6565

0 commit comments

Comments
 (0)