Skip to content

Commit c968f18

Browse files
authored
Merge branch 'master' into patch-1
2 parents 9615157 + 41e4bde commit c968f18

File tree

5 files changed

+59
-20
lines changed

5 files changed

+59
-20
lines changed

user/build-matrix.md

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,43 @@ script: env $EXTRA_TESTS ./test.py $TEST_SUITE
216216
```
217217
{: data-file=".travis.yml"}
218218

219+
### Explicitly included jobs with only one element in the build matrix
220+
221+
As a special case, if your build matrix has only one element _and_ you have
222+
explicitly included jobs, matrix expansion is not done and the explicit jobs
223+
_completely_ define your build. For example:
224+
225+
```yaml
226+
language: python
227+
python:
228+
- '3.5'
229+
matrix:
230+
include:
231+
- env: EXTRA_TESTS=true
232+
# only defines one job with `python: 3.5` and `env: EXTRA_TESTS=true`
233+
```
234+
{: data-file=".travis.yml"}
235+
236+
If you need the (sole) job from the matrix in such a case, too,
237+
add a blank job entry to the explicit list (as it would
238+
[inherit all values from the matrix](#explicitly-included-jobs-inherit-the-first-value-in-the-array)
239+
with no changes):
240+
241+
```yaml
242+
language: python
243+
python:
244+
- '3.5'
245+
matrix:
246+
include:
247+
-
248+
- env: EXTRA_TESTS=true
249+
# defines two jobs:
250+
# - python: 3.5
251+
# - python: 3.5
252+
# env: EXTRA_TESTS=true
253+
```
254+
{: data-file=".travis.yml"}
255+
219256
## Rows that are Allowed to Fail
220257

221258
You can define rows that are allowed to fail in the build matrix. Allowed

user/deployment/npm.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ publishes to npmjs.com, however if you have a `publishConfig.registry` key in yo
1616
A minimal `.travis.yml` configuration for publishing to [npmjs.com][npmjs] with npm version 2+ looks like:
1717

1818
```yaml
19+
language: node_js
20+
node_js:
21+
- "11.13"
22+
1923
deploy:
2024
provider: npm
2125
email: "YOUR_EMAIL_ADDRESS"

user/installing-dependencies.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ To install Ubuntu packages that are not included in the standard [precise](/user
1414

1515
```yaml
1616
before_install:
17-
- sudo apt-get install -y libxml2-dev
17+
- sudo apt-get -y install libxml2-dev
1818
```
1919
{: data-file=".travis.yml"}
2020
@@ -23,24 +23,24 @@ By default, `apt-get update` does not get run automatically. If you want to upda
2323
```yaml
2424
before_install:
2525
- sudo apt-get update
26-
- sudo apt-get install -y libxml2-dev
26+
- sudo apt-get -y install libxml2-dev
2727
```
2828
{: data-file=".travis.yml"}
2929

3030
The second way is to use the [APT addon](#installing-packages-with-the-apt-addon):
3131

3232
```yaml
3333
before_install:
34-
- sudo apt-get install -y libxml2-dev
34+
- sudo apt-get -y install libxml2-dev
3535
addons:
3636
apt:
3737
update: true
3838
```
3939
{: data-file=".travis.yml"}
4040

41-
> Do not run `apt-get upgrade` in your build as it downloads up to 500MB of packages and significantly extends your build time.
41+
> Do not run `apt-get upgrade` in your build as it downloads up to 500MB of packages and significantly extends your build time. Additionally, some packages may fail to update, which will lead to a failed build.
4242
>
43-
> Use the `-y` parameter with apt-get to assume yes as the answer to each apt-get prompt.
43+
> Use the `-y` parameter with apt-get to assume yes to all queries by the apt tools.
4444

4545
### Installing Packages from a custom APT repository
4646

@@ -50,9 +50,9 @@ For example, to install gcc from the ubuntu-toolchain ppa
5050

5151
```yaml
5252
before_install:
53-
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
54-
- sudo apt-get update -q
55-
- sudo apt-get install gcc-4.8 -y
53+
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
54+
- sudo apt-get -q update
55+
- sudo apt-get -y install gcc-4.8
5656
```
5757
{: data-file=".travis.yml"}
5858

@@ -66,8 +66,8 @@ This example adds the APT repository for Varnish 3.0 for Ubuntu 12.04 to the loc
6666
before_script:
6767
- curl http://repo.varnish-cache.org/debian/GPG-key.txt | sudo apt-key add -
6868
- echo "deb http://repo.varnish-cache.org/ubuntu/ precise varnish-3.0" | sudo tee -a /etc/apt/sources.list
69-
- sudo apt-get update -qq
70-
- sudo apt-get install varnish -y
69+
- sudo apt-get -qq update
70+
- sudo apt-get -y install varnish
7171
```
7272
{: data-file=".travis.yml"}
7373

user/languages/julia.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ julia:
3737
Acceptable formats are:
3838
- `nightly` will test against the latest [nightly build](https://julialang.org/downloads/nightlies.html)
3939
of Julia.
40+
- `X` will test against the latest release for that major version. (Applies only to major versions 1 and later.)
4041
- `X.Y` will test against the latest release for that minor version.
4142
- `X.Y.Z` will test against that exact version.
4243

user/migrate/open-source-repository-migration.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,18 @@ When a repository is migrated, the following information will be transferred to
1919
* Cron jobs configured for the repository
2020
* Last build status - the build badge in travis-ci.com will reflect this status until new builds are triggered
2121
* Next build number
22+
* Previous build history
2223

2324
### What information will not be transferred to travis-ci.com?
2425

25-
The following information will not be transferred to travis-ci.com when a repository is migrated.
26+
The following information will not be transferred to travis-ci.com when a repository is migrated:
2627

27-
* Previous build history - your builds from before the migration to travis-ci.com will remain on travis-ci.org until the complete build- history migration (sometime in early Q3 2019)
2828
* Caches - they will be re-created automatically on the first build on travis-ci.com
2929

3030
## Do I need to make any other changes?
3131

3232
You only need to make any changes yourself if you use any of the following features:
3333

34-
* **build badges**: make sure to update the URL to reflect the new repository setup in travis-ci.com. In the future, we will automatically redirect travis-ci.org badge URLs to the corresponding travis-ci.com ones.
35-
3634
* **"Protected Branches" feature in GitHub** to require a passing Travis CI build before merging a Pull Request: make sure to edit your required status checks to now use `Travis CI - Pull Request` and/or `Travis CI - Branch`. See: [Required status checks at GitHub](https://help.github.com/articles/about-required-status-checks/).
3735

3836
* **[Travis CLI](https://github.com/travis-ci/travis.rb)**: after migration make sure to add the `--com` flag or [make it your default endpoint](https://github.com/travis-ci/travis.rb#endpoint) by running: `travis endpoint --com --set-default`.
@@ -45,16 +43,15 @@ Your repository on travis-ci.org will be automatically deactivated (that is, it
4543

4644
With this read-only mode:
4745

48-
* All the previous build history will be accessible at travis-ci.org
4946
* The "Trigger build" functionality won't be available in travis-ci.org
5047
* It won't be possible to restart a previous job that ran in travis-ci.org
5148
* The Settings page for your repository will become inactive - the transferred repository settings will now be available in travis-ci.com instead.
5249

53-
In the future, when all the previous build history is migrated, we will provide redirections from all API/web requests going to travis-ci.org to travis-ci.com.
50+
In the future, we will provide redirections from all API/web requests going from travis-ci.org to travis-ci.com.
5451

5552
## How long does the migration process take?
5653

57-
The migration process for a repository should not take more than a couple of seconds.
54+
The migration process for each repository should not take more than a couple of seconds.
5855

5956
## Can I migrate multiple repositories at once?
6057

@@ -77,14 +74,14 @@ If you are already using GitHub Apps for your account in travis-ci.com, you need
7774

7875
3. When activating the Travis CI GitHub App, grant access to the repositories (both public and private) that you want to build in travis-ci.com. Save the changes.
7976

80-
4. Once back in your Travis CI profile, the selected repositories will be listed there. Those projects that were already building in travis-ci.com, or any new public or private projects will now be active in travis-ci.com.
77+
4. Once back in your Travis CI profile, the selected repositories will be listed there. Those projects that were already building in travis-ci.org will appear in the Migrate tab for your account.
8178

8279
### The migration steps
8380

84-
1. Once you have granted access via GitHub Apps to the repositories you'd like to build and transfer, a new ["Migrate" tab](https://travis-ci.com/account/migrate) will appear in your account page with a list of the repositories to migrate:
81+
1. Once you have granted access via GitHub Apps to the repositories you'd like to build and transfer, on the ["Migrate" tab](https://travis-ci.com/account/migrate), there will be a list of the repositories available to migrate:
8582
![Migration repository list](/user/images/oss-migration/repos-to-migrate.png)
8683

87-
2. Select the repositories you'd like to migrate and click "Migrate selected repositories", You'll be asked for a final confirmation - please remember that your build history will not be migrated at this time (See: [What information will not be transferred to travis-ci.com?](#what-information-will-not-be-transferred-to-travis-cicom)).
84+
2. Select the repositories you'd like to migrate and click "Migrate selected repositories", You'll be asked for a final confirmation - please remember that you'll need to update protected branches (See: [Do I need to make any other changes?](#do-i-need-to-make-any-other-changes)).
8885

8986
3. Confirm the migration. The icons next to your repository name will show the migration status ("processing", or "migrated"):
9087
![Migration statuses](/user/images/oss-migration/migration-statuses.png)

0 commit comments

Comments
 (0)