Skip to content

Commit 76618ac

Browse files
authored
Merge pull request #621 from travis-ci/sw-workers
Remove worker pages and improve Environment reference
2 parents cc137a9 + cf0064f commit 76618ac

5 files changed

+14
-95
lines changed

user/ci-environment.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
title: The Build Environment
33
layout: en
44
permalink: /user/ci-environment/
5+
redirect_from:
6+
- /user/workers/container-based-infrastructure/
7+
- /user/workers/standard-infrastructure/
8+
- /user/workers/os-x-infrastructure/
59
---
610

711
### What This Guide Covers
@@ -73,7 +77,7 @@ The following table summarizes the differences between the virtual environments:
7377
</tr>
7478
<tr>
7579
<td>Cache available</td>
76-
<td>private &amp; public</td>
80+
<td>private only</td>
7781
<td>private &amp; public</td>
7882
<td>private only</td>
7983
<td>private &amp; public</td>

user/osx-ci-environment.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,17 @@ For example, if you always want the latest version of xctool, you can run this:
8585
- brew update
8686
- brew outdated xctool || brew upgrade xctool
8787

88+
## File System
89+
90+
VMs running OS X use the default file system, HFS+.
91+
This file system is case-insensitive, and returns entities within a
92+
directory alphabetically.
93+
94+
8895
## JDK and OS X
8996

90-
The JDK available in the OS X environment is tied to the Xcode version selected for your build, it is not set independently. To use a particular JDK for your build, be sure to select an [OS X image](#OS-X-Version) which includes the version of Java that you need.
97+
The JDK available in the OS X environment is tied to the Xcode version selected for your build, it is not set independently. To use a particular JDK for your build, be sure to select an [OS X image](#OS-X-Version) which includes the version of Java that you need.
98+
9199

92100
## Compilers and Build toolchain
93101

user/workers/container-based-infrastructure.md

-45
This file was deleted.

user/workers/os-x-infrastructure.md

-20
This file was deleted.

user/workers/standard-infrastructure.md

-28
This file was deleted.

0 commit comments

Comments
 (0)