Skip to content

Commit 6b5c520

Browse files
authored
Merge branch 'master' into patch-1
2 parents 72ae4cb + 9d40547 commit 6b5c520

File tree

2 files changed

+2
-35
lines changed

2 files changed

+2
-35
lines changed

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ GEM
147147
mime-types (3.3.1)
148148
mime-types-data (~> 3.2015)
149149
mime-types-data (3.2020.0512)
150-
mini_portile2 (2.5.0)
150+
mini_portile2 (2.5.1)
151151
minitest (5.14.1)
152152
multi_json (1.14.1)
153153
multipart-post (2.1.1)
154154
netrc (0.11.0)
155155
nio4r (2.5.2)
156-
nokogiri (1.11.2)
156+
nokogiri (1.11.4)
157157
mini_portile2 (~> 2.5.0)
158158
racc (~> 1.4)
159159
nokogumbo (2.0.2)

user/reference/osx.md

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -121,39 +121,6 @@ and later, use `xcode9.4` (or later).
121121
Every worker has at least one version of Go, Java, Python, Ruby and NodeJS to accommodate
122122
projects that may need one of those runtimes during the build.
123123

124-
## Environment variables
125-
126-
- `CI=true`
127-
- `TRAVIS=true`
128-
- `USER=travis`
129-
- `HOME=/Users/travis`
130-
131-
Additionally, Travis CI sets environment variables you can use in your build,
132-
e.g. to tag the build, or to run post-build deployments.
133-
134-
- `TRAVIS_BRANCH`:For builds not triggered by a pull request this is the
135-
name of the branch currently being built; whereas for builds triggered
136-
by a pull request this is the name of the branch targeted by the pull
137-
request (in many cases this will be `master`).
138-
- `TRAVIS_BUILD_DIR`: The absolute path to the directory where the repository
139-
being built has been copied on the worker.
140-
- `TRAVIS_BUILD_ID`: The id of the current build that Travis CI uses internally.
141-
- `TRAVIS_BUILD_NUMBER`: The number of the current build (for example, "4").
142-
- `TRAVIS_COMMIT`: The commit that the current build is testing.
143-
- `TRAVIS_COMMIT_RANGE`: The range of commits that were included in the push
144-
or pull request. (Note that this is empty for builds triggered by the initial commit of a new branch.)
145-
- `TRAVIS_JOB_ID`: The id of the current job that Travis CI uses internally.
146-
- `TRAVIS_JOB_NUMBER`: The number of the current job (for example, "4.1").
147-
- `TRAVIS_PULL_REQUEST`: The pull request number if the current job is a pull
148-
request, "false" if it's not a pull request.
149-
- `TRAVIS_SECURE_ENV_VARS`: Whether or not secure environment vars are being
150-
used. This value is either "true" or "false".
151-
- `TRAVIS_REPO_SLUG`: The slug (in form: `owner_name/repo_name`) of the
152-
repository currently being built. (for example, "travis-ci/travis-build").
153-
- `TRAVIS_OS_NAME`: On multi-OS builds, this value indicates the platform the job is running on.
154-
Values are `linux` and `osx` currently, to be extended in the future.
155-
- `TRAVIS_TAG`: If the current build is for a git tag, this variable is set to the tag's name.
156-
157124
## Ruby versions/implementations
158125

159126
Default macOS Ruby (depends on macOS version) -- You need to use `sudo` to install gems with this Ruby and you can also use the [pre-compiled Ruby binaries](https://rubies.travis-ci.org/) we made available.

0 commit comments

Comments
 (0)