From a93ceca4078e2c0dc27a989d164d22fb8243b336 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Tue, 15 Sep 2020 16:59:29 +0000 Subject: [PATCH 01/30] Update master --- _includes/deploy/providers/ecr.md | 45 +++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 _includes/deploy/providers/ecr.md diff --git a/_includes/deploy/providers/ecr.md b/_includes/deploy/providers/ecr.md new file mode 100644 index 00000000000..bd1727c67f5 --- /dev/null +++ b/_includes/deploy/providers/ecr.md @@ -0,0 +1,45 @@ +{% unless include.minimal == false %} +For a minimal configuration, add the following to your `.travis.yml`: + +```yaml +deploy: + provider: ecr + access_key_id: + secret_access_key: + source: + target: + edge: true # opt in to dpl v2 +``` +{: data-file=".travis.yml"} + + + +{{ include.content }} +{% endunless %} + +## Status + +Support for deployments to AWS ECR is in **alpha**. Please see [Maturity Levels](/user/deployment-v2#maturity-levels) for details. +## Known options + +Use the following options to further configure the deployment. + +| `access_key_id` | AWS access key — **required**, **secret**, type: string | +| `secret_access_key` | AWS secret access key — **required**, **secret**, type: string | +| `account_id` | AWS Account ID — type: string, note: Required if the repository is owned by a different account than the IAM user | +| `source` | Image to push — **required**, type: string, note: can be the id or the name and optional tag (e.g. mysql:5.6) | +| `target` | Comma separated list of partial repository names to push to — **required**, type: string | +| `region` | Comma separated list of regions to push to — type: string, default: `us-east-1` | + +### Shared options + +| `cleanup` | Clean up build artifacts from the Git working directory before the deployment — type: boolean | +| `run` | Commands to execute after the deployment finished successfully — type: string or array of strings | + +## Environment variables + +All options can be given as environment variables if prefixed with `AWS_`. + +For example, `access_key_id` can be given as `AWS_ACCESS_KEY_ID=`. + +{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %} \ No newline at end of file From 7336a692d3d5ee2f9c38c2e944a8c9b23dca3b70 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Mon, 21 Sep 2020 17:03:16 +0000 Subject: [PATCH 02/30] Update master --- user/languages/julia.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/languages/julia.md b/user/languages/julia.md index 35b729b95db..eaac8475f6f 100644 --- a/user/languages/julia.md +++ b/user/languages/julia.md @@ -35,7 +35,7 @@ julia: {: data-file=".travis.yml"} Acceptable formats are: - - `nightly` will test against the latest [nightly build](https://julialang.org/downloads/nightlies.html) + - `nightly` will test against the latest [nightly build](https://julialang.org/downloads/nightlies/) of Julia. - `X` will test against the latest release for that major version. (Applies only to major versions 1 and later.) - `X.Y` will test against the latest release for that minor version. From d9148af61b23a2705556ac9b6f7703857fd2b936 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Mon, 5 Oct 2020 17:10:27 +0000 Subject: [PATCH 03/30] Update master --- user/languages/python.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/user/languages/python.md b/user/languages/python.md index f4fd07a3980..02c78d6c686 100644 --- a/user/languages/python.md +++ b/user/languages/python.md @@ -158,8 +158,6 @@ If you're using tox to test your code against multiple versions of Python, you h * use `language: generic` and manually install the Python versions you're interested in before running tox (without the manual installation, tox will only have access to the default Ubuntu Python versions - 2.7.12 and 3.5.1 for Xenial) * use `language: python` and a build matrix that uses a different version of Python for each branch (you can specify the Python version by using the `python` key). This will ensure the versions you're interested in are installed and parallelizes your workload. -A good example of a `travis.yml` that runs tox using a Travis build matrix is [twisted/klein](https://github.com/twisted/klein/blob/master/.travis.yml). - ## Running Python tests on multiple Operating Systems Sometimes it is necessary to ensure that software works the same across multiple Operating Systems. This following `.travis.yml` file will execute parallel test runs on Linux, macOS, and Windows. From d0bc4fa405d50dd4d540f8e15fc421f2dc0b6efe Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Thu, 8 Oct 2020 17:12:09 +0000 Subject: [PATCH 04/30] Update master --- _data/xcodes.yml | 69 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 64 insertions(+), 5 deletions(-) diff --git a/_data/xcodes.yml b/_data/xcodes.yml index d093475db86..8fb5932cdfb 100644 --- a/_data/xcodes.yml +++ b/_data/xcodes.yml @@ -1,4 +1,63 @@ osx_images: + - image: xcode12.2 + xcode: "12.2" + osx_version: "10.15.7" + xcode_full_version: "12.2" + xcode_build_version: "12B5018i" + image_publish_date: 2020-10-06 + sdks: + - iphoneos14.2 + - iphonesimulator14.2 + - macosx11.0 + - appletvos14.2 + - appletvsimulator14.2 + - watchos7.1 + - watchsimulator7.1 + simulators: + - iOS 10.3 + - iOS 11.0 + - iOS 11.1 + - iOS 11.2 + - iOS 11.3 + - iOS 11.4 + - iOS 12.0 + - iOS 12.1 + - iOS 12.2 + - iOS 12.4 + - iOS 13.0 + - iOS 13.1 + - iOS 13.2 + - iOS 13.3 + - iOS 13.4 + - iOS 13.5 + - iOS 14.0 + - tvOS 10.2 + - tvOS 11.0 + - tvOS 11.1 + - tvOS 11.2 + - tvOS 11.3 + - tvOS 11.4 + - tvOS 12.0 + - tvOS 12.1 + - tvOS 12.2 + - tvOS 12.4 + - tvOS 13.0 + - tvOS 13.2 + - tvOS 13.3 + - tvOS 13.4 + - tvOS 14.0 + - watchOS 3.2 + - watchOS 4.0 + - watchOS 4.1 + - watchOS 4.2 + - watchOS 5.0 + - watchOS 5.1 + - watchOS 5.2 + - watchOS 5.3 + - watchOS 6.1 + - watchOS 6.2 + - watchOS 7.0 + jdk: "14.0.2" - image: xcode12u xcode: "12 (Universal)" osx_version: "10.15.5" @@ -15,14 +74,14 @@ osx_images: jdk: "14.0.1" - image: xcode12 xcode: "12" - osx_version: "10.15.5" - xcode_full_version: "12.0" - xcode_build_version: "12A8189h" - image_publish_date: 2020-08-24 + osx_version: "10.15.7" + xcode_full_version: "12.0.1" + xcode_build_version: "12A7300" + image_publish_date: 2020-10-06 sdks: - iphoneos14.0 - iphonesimulator14.0 - - macosx11.0 + - macosx10.15 - appletvos14.0 - appletvsimulator14.0 - watchos7 From b7776bf4033ba57222c350cb513e69480175defb Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Fri, 23 Oct 2020 17:20:04 +0000 Subject: [PATCH 05/30] Update master --- user/docker.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/user/docker.md b/user/docker.md index 29cf6730e05..4e4aa6b6874 100644 --- a/user/docker.md +++ b/user/docker.md @@ -6,6 +6,8 @@ layout: en +> Please note that, due to the upcoming [Docker Rate Limit announcement](https://docs.docker.com/docker-hub/download-rate-limit/), users will be required to add their own authentication information to their build settings or build config as documented below. + Travis CI builds can run and build Docker images, and can also push images to Docker repositories or other remote storage. From 87b7493630b4c9b5327a3f768ac60828a072e50c Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Wed, 28 Oct 2020 17:23:03 +0000 Subject: [PATCH 06/30] Update master --- .../open-source-repository-migration.md | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/user/migrate/open-source-repository-migration.md b/user/migrate/open-source-repository-migration.md index ccab78eb402..37ec440698e 100644 --- a/user/migrate/open-source-repository-migration.md +++ b/user/migrate/open-source-repository-migration.md @@ -1,5 +1,5 @@ --- -title: Beta - Migrating repositories to travis-ci.com +title: Migrating repositories to travis-ci.com layout: en redirect_from: user/open-source-repository-migration/ --- @@ -185,3 +185,49 @@ If you have any further questions, comments or need help on our Beta migration p [travis-ci.com]: https://www.travis-ci.com [travis-ci.org]: https://www.travis-ci.org + +## Frequently asked questions + +#### Q. When will the migration from travis-ci.org to travis-ci.com be completed? + +A. In an effort to ensure that all of our users - whether you build open-source, public or private repositories - receive regular feature updates, security patches and UX/UI enhancements, we are announcing that travis-ci.org will be officially closed down completely no later than December 31st, 2020, allowing us to focus all our efforts on bringing new features and fixes to travis-ci.com and all of our awesome users like yourself on the travis-ci.com domain. + + +#### Q. What will happen to travis-ci.org after December 31st, 2020? + +A. Travis-ci.org will be switched to a read-only platform, allowing you to see your jobs build history from all repositories previously connected to travis-ci.org. + + +#### Q. Why are some of my queued jobs taking longer than usual to build? + +A. At peak usage times, you may see your build times are longer than they previously have been - we need to make sure all users have equal access to the .org platform until the end of the year as we move our infrastructure across to .com. You may want to consider migrating across to .com sooner rather than later, or consider scheduling builds at a quieter time of the day if remaining on .org for a while longer. + + +#### Q. Why are some of my queued jobs being cancelled? + +A. This might happen as we move infrastructure over from .org to .com - if we see a job stuck in a queue for more than 16 hours, we will review this on a case by case basis and possibly cancel the job to ensure resources are not being reduced across the platform. You may want to consider migrating across to .com sooner rather than later, or consider building at a quieter time of the day if remaining on .org for a while longer. + + +#### Q. Will there be lower concurrency for free accounts on travis-ci.org? + +A. As part of the shift of infrastructure from .org to .com and needing to make sure all users have equal access to resources, free and open-source .org accounts will have concurrency reduced from 5 to 4 concurrent jobs. Concurrent jobs have not changed on .com, so please consider migrating your repositories as soon as possible if this is an issue. + + +#### Q. Will Travis-ci.org become unreliable? + +A. As part of the shift of infrastructure from .org to .com we’re making a number of changes to the travis-ci.org infrastructure to ensure the service will remain as reliable and available to you as it always has been until the + + +#### Q. Will Travis CI be getting rid of free users? + +A. Travis CI will continue to offer a free tier for public or open-source repositories on travis-ci.com and will not be affected by the migration. + + +#### Q. Why is travis-ci.com asking for write access to my repositories? + +A. We’re aware that when migrating your GitHub repositories to travis-ci.com you will be prompted to give Travis CI write access to your repositories - this is due to us currently using GitHub OAuth for user authentication and the message is due to the way the OAuth scopes are shaped. The Travis CI platform actually uses the GitHub App for actual repository-level access - it does not require write access to all of your repositories and you can configure that. + +We’re working hard to resolve this and use just the GitHub App for both +user authentication and repository-level access, but until then we will be clarifying the situation in our documentation and user interface. + + From 2d47bdfae33f19a77eeef1530e7242e80ee657eb Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Thu, 29 Oct 2020 17:23:15 +0000 Subject: [PATCH 07/30] Update master --- user/migrate/open-source-repository-migration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/migrate/open-source-repository-migration.md b/user/migrate/open-source-repository-migration.md index 37ec440698e..402f1507f71 100644 --- a/user/migrate/open-source-repository-migration.md +++ b/user/migrate/open-source-repository-migration.md @@ -215,7 +215,7 @@ A. As part of the shift of infrastructure from .org to .com and needing to make #### Q. Will Travis-ci.org become unreliable? -A. As part of the shift of infrastructure from .org to .com we’re making a number of changes to the travis-ci.org infrastructure to ensure the service will remain as reliable and available to you as it always has been until the +A. As part of the shift of infrastructure from .org to .com we’re making a number of changes to the travis-ci.org infrastructure to ensure the service will remain as reliable and available to you as it always has been until the migration is completed. #### Q. Will Travis CI be getting rid of free users? From 044204452aefd77108c4c9e331f85c62d6a5beca Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Sun, 1 Nov 2020 17:24:41 +0000 Subject: [PATCH 08/30] Update master --- _includes/sidebar.html | 6 ++ user/billing-faq.md | 92 +++++++++++++++++++++++++ user/billing-overview.md | 145 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 243 insertions(+) create mode 100644 user/billing-faq.md create mode 100644 user/billing-overview.md diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 37ad0f94296..adf6a2c594c 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -135,6 +135,12 @@

Developer Program

  • Triggering Builds with API V3
  • The Ruby Library
    • + +

    Hosted Billing

    +

    Travis CI Enterprise

      diff --git a/user/billing-faq.md b/user/billing-faq.md new file mode 100644 index 00000000000..ba03694b2bd --- /dev/null +++ b/user/billing-faq.md @@ -0,0 +1,92 @@ +--- +title: Billing FAQ +layout: en +permalink: /user/billing-faq/ + +--- + +> Please see our **[Billing overview](/user/billing-overview/)** first. + +## How can I get on an annual plan? + +The annual based plans are available by contacting the Travis CI support team. + + +## How can I get on the usage based plan? + +The usage based plan is available by contacting theTravis CI support team. + +## How are the credits deducted? + +The credits will be deducted from the credits pool after each build job is executed depending on the operation system used. + +## How can I check how much I will pay for user licenses at the end of the month? + +The unique users triggering builds within a billing period will constitute a number of actual user licenses used and will be charged at the end of the billing period, according to the rates in a selected plan. + +By default Travis CI system provides the possibility to trigger a build to all members of your team on GitHub, Bitbucket, GitLab and Assembla who have writing rights on repositories. +If the team member has not triggered the build during the billing period Travis CI will not charge you for that user. + + +To check how much active users you got during the last billing cycle please contact the support. +Travis CI is working on the user management functionality where you will be able: + +* To see how many users has rights to trigger the build +* To see how many was active/trigger the build during the last month +* Select the users who are able to trigger the build + +## What if I am building open source? + +Each of the Travis CI Plans can have an amount of special OSS credits per month assigned to run builds only on public repositories. To find out more about it please contact the Travis CI support team. + + +## How do I use credits? + +You can use your credits to run builds on your public and private repositories. +You may have been assigned an amount of OSS credits to run builds on public repositories. When you run out of OSS credits but want to keep building on public repositories you can go to the Plan page and turn the Credits consumption for OSS switcher to `On`. In this case, once the ‘OSS credits’ pool is depleted, the system starts deducting from the ‘paid credits’ pool. Builds for OSS repositories will be allowed to start, and deducted from the paid credits. + +## How do I recharge my credits balance? + +You can buy additional build credits anytime you need them by clicking on your profile icon in the right upper corner of the screen =>Settings, navigate to the Plan page and press the ‘Buy add-ons’ button. +Please be advised that it is not possible to buy additional credits on Free Plan. + + +## Do credits expire? + +No, the credits you purchased do not expire. + +## Can you send me an invoice? + +The invoice is sent automatically by the Travis CI system after the Plan purchase or subsequent user license charge is made. + + +## Can I get a refund? + +Upon cancellation of your account or switching back to the Free Plan, you can request a refund under the following conditions: + +* You haven’t used any paid credits +* Request made up to and including 14 days after the billing date: applicable for full refund + +Contact our support team at support@travis-ci.com Specify the GitHub/Bitbucket/GitLab/Assembla handle of the account for which you’re requesting a refund, and send us a copy of your payment and/or invoice. + + +## How do I cancel my paid plan? + +If you want to cancel your paid plan, click on your profile icon in the right upper corner of the screen =>Settings, navigate to the Plan page and press the ‘Change Plan’ button and choose the Free Plan. +Travis CI Free plan will provide you with 10,000 build credits to try it out for public and private repositories builds and unlimited number of users with no charge. +If you want your account to be deleted, please contact the Travis CI support. + + +## Do these prices include tax? + +No, all prices do not include tax. + +## Can I sign up for automatic renewals for usage based plan? + +The per-seats licence invoice will be charged and sent automatically after each month you use the Travis CI service, based on the maximum number of unique users who triggered the build during the given month. +Unfortunately, right now it is not possible to configure automatic renewals for build credits. You need to manually buy credits each time you are about to run out of them. We intend to make it more convenient in the near future. +To help you track the build credit consumption Travis CI system will send the notification emails each time your credit balance is used up by 50, 75 and 100%. + +## Are add-ons limited to a certain number of users? + +You can buy additional add-ons any time you feel it is needed. You and your organization’s members can use the bought add-ons with no limitations. diff --git a/user/billing-overview.md b/user/billing-overview.md new file mode 100644 index 00000000000..29144821b75 --- /dev/null +++ b/user/billing-overview.md @@ -0,0 +1,145 @@ +--- +title: Billing Overview +layout: en +permalink: /user/billing-overview/ + +--- + +> A new billing engine has been introduced on November 1st, 2020 to [https://travis-ci.com](https://travis-ci.com) + +## Travis CI Plan types + + +Travis CI billing system consists of two types of subscriptions: Concurrent based plans and Usage based plan. +The variety of plans provides you with flexibility to choose the plan that suits your needs. + + +| Billing Period | Concurrency based | Usage based | +|:------- |:-----------------:|:-----------:| +|Month | Concurrent jobs limit
      Unlimited build minutes on Linux, Windows, and FreeBSD
      Paid macOS builds (credits)

      Available via [site](https://travis-ci.com/account/plan) | Very high or no concurrency limit
      Paid macOS, Linux, Windows, and FreeBSD build minutes (credits)
      Paid user licenses (only per users trigerring the builds)

      Contact Travis CI to obtain| + +For majority of users one of concurrency based plans should be sufficient. However if you build a lot of minutes per month and concurrency becomes a bottleneck, please contact Travis CI asking for Usage based plan. + +A 'Free' Plan, assigned automatically to every new sign up, is Usage based plan with no limits on users and a trial pool of credits to be used. + + +## Concurrency based plans + +Concurrency based plans is much like what Travis CI has been oferring already for a long time: an ability to run a build consisting of X concurrent jobs. +In Travis CI builds are executed singularly, without exceeding limitations. Therefore, if executing multiple builds at the same time or executing a build with multiple build jobs, once the concurrency limit is reached, the reminder builds/jobs must wait until there is a queue capacity available for processing. + +> If a user on the 2 concurrent jobs plan executes a build with 5 build jobs, only the first 2 builds are processed while the remaining 3 of the builds wait in line to be processed. +> +> If a user/organization subscribes to the 5 concurrent jobs plan and executes 2 builds consisting of 5 jobs each, the second build will be sitting in the queue and waiting to be executed after the 5 jobs of the first build are done. + +Linux, Windows and FreeBSD builds are included in the price on these plans. The macOS builds are paid separately on concurrency plans, and can be run after purchasing the separate credits add-on. +Credits are used to pay for each build job minute on macOS. Purchase only the credits you need and use them until you run out. Please see more in 'Usage based' section. + +> If a user/organization on the 2 concurrent jobs Plan executes build with jobs for `os: linux` and `os: freebsd` it will execute as soon as the concurrency capacity is available for particular build jobs. +> +> If a user/organization on the same Plan tries to execute a job for `os: macOS` and has no credits available (see your [Plans](https://travis-ci.com/account/plan)), this build will not execute. In order to overcome that, an add-on must be purchased, e.g. 25k credits. Now the build can be executed and pre-defined amount of [credits will be charged for each build minute](/user/billing-overview/#usage---credits). + + +### Concurrency based Plan - Summary + +| Area | Details | +| :--- | --- | +| **Payment** | The subscription is charged automatically in advance, at the beginning of each billing period.
      The optional credits for macOS builds can be purchased at any time and used only when you need them. Charge is applied immediately upon transaction. | +| **Private/Public repositories** | With paid subscription you can build over both private and public repositories. | +| **Build job limits** | As per Plan | + + +### Concurrency Plan - How to obtain? + +1. Sign in to Travis CI with [Version Control System of your choice](/user/tutorial/). +2. Navigate to the [Plans](https://travis-ci.com/account/plan) and select of of 'X concurrent jobs Plan'. +3. Enter your billing details. **Please note, that all prices are provided netto, w/o any VAT or other applicable local taxes**. If you are EU based VAT paying company, do not forget to enter your VAT number. +4. Confirm transaction. + + + +## Usage based plans + +> **If you are running a large number of builds or users each month, please [contact Travis CI support](mailto:support@travis-ci.com) if you’d like to discuss your plan.** + +The usage based pricing system charges users and organizations depending on the amount of minutes each of the build jobs run on Travis CI infrastructure. +The usage based pricing is a pre-paid model for credits and subscriptions for per-user-license. In other words, users and organizations can run as many build jobs as they want at the same time, meaning that all builds are executed as soon as possible without limitations. +The final cost is flexible and closely related to the actual usage of the system, allowing you to downscale or upscale as per your needs. + +> The usage based pricing model bills based on minutes used (via credits) and number of users executing those builds (via user licenses). Users subscribe to a plan that provides them an allocation of credits to be used towards build minutes and a pricing for specific number of user licenses. The credits are deducted from the users credit balance as they are used in the Travis CI service. +Unique users triggering builds within a billing period will constitute a number of actual user licenses used and will be charged at the end of the billing period, according to the rates of their selected plan. + + +### Usage - Credits + +Credits are purchased at your discretion as an 'addon'. The Plan you are on determines what selection addons is available for you. Credit addons are paid in advance. +Thus whenever you select or are assigned an Usage based plan: + +* Plan has the default allotment of credits associated (default Credits addon) +* Only advance charge is related to the allotment of credits available initially in the Plan, e.g. Plan coming with 25,000 credits will result in immediate charge according to the enlisted price + +Credits are deducted from your balance each time a build job ends either with some result or is cancelled manually by you. Each started build job minute has a credit cost associated with the environment as per table below. + +| OS | # Credits per
      started build minute | +|:--------------------:|:-----------:| +| Linux | 10 | +| Experimental FreeBSD | 10 | +| Windows | 20 | +| MacOS | 50 | + +Build job minutes are counted from the moment when [VM or LXD container](/user/reference/overview/#virtualization-environments) is spun up, thus queue waiting time or spinning-up time are not taken into the account when calculating job duration time. + +Additional credits can be purchased at any time. Credits are replenished by purchasing credits addon. + +> Automated credits purchasing is not available yet, please follow our blog and twitter for updates. + +Your credits remain available until you use them or disband them. At the moment we do not discard unusued paid credits after 12 months, yet this may be a subject to change on short notice. + +You may disband your credits. It will happen when + +* you switch from usage based plan to a Free Plan (which cancels the paid Plan) + +and is meant to prevent abusive usage of the system. + + +#### Credits vs. OSS Only Credits + +Credits can be used to build both over private and public repositories. + +On occassion, an allotment of OSS Only credits may be granted by Travis CI. These credits may be used only for builds over public repositories and are meant for open source support. +The OSS credits may be assigned as one time pool or renewable pool, subject to case by case assesment of Travis CI staff. + +The OSS credits is a pool of credits completely separate from regular credits, with separate credits balance tracking. + + +### Usage - User Licenses + +Usage based plan charges you at the end of each month for the number of users who triggered the builds during this month. + +With every build started, Travis CI keeps track of how many unique users triggered a build within current billing period. At the end of the month the total amount is used to calculate the user license charge. + +> If a person A triggers a build, and a person B triggers a build, the billing system will recognize 2 unique users. Now if person A or B again triggers a build, the amount of unique users trigerring remains 2 (assuming builds are trigerred within the same billing period). Only when user C triggers a build within the same billing period the amount of unique users triggering a build will be increased to 3. +> +> By default, all users you've granted write rights to your repository are allowed to trigger a build. We are preparing a separate page in your Travis CI account page, which will allow you to manage which users exactly are allowed to trigger the build in order to give you more control. Please watch out for updates. + +### Usage based Plan - Summary + +| Area | Details | +| :--- | --- | +| **Payment** | Credits are paid in advance:
      1. Upon purchasing a Plan, an immediate charge is applied depending on credits allotment coming with a Plan.
      2. The additional credit addons can be purchased at any time and credits used only when you need them. Charge is applied immediately upon transaction.

      The user license cost is charged automatically in arrears, at the end of each billing period. The number of unique users trigerring a build is charged according to the license rates. | +| **Private/Public repositories** | With Credits you can build over both private and public repositories.
      With OSS Credits you can build only over public repositories. | +| **Build job limits** | None or very high.

      The Free Plan assigned automatically upon sign-up has a limit of 20 concurrent jobs. | + + +### Usage based Plan - How to obtain? + +1. Sign in to Travis CI with [Version Control System of your choice](/user/tutorial/). +2. Navigate to the [Plans](https://travis-ci.com/account/plan) and make sure you have your billing and contact details filled in correctly. +3. Contact [Travis CI support](mailto:support@travis-ci.com) requesting Usage based Plan. + + +## Getting Help + +If you have any questions or issues with the new VCS, please see our [Billing FAQ](/user/billing-faq) or email [support@travis-ci.com](mailto:support@travis-ci.com) for help. + +We’d love to hear what you think of our new Pricing and if there’s something that you’d like to see included or improved! Let us know in the Travis CI Community Forum. From 85003188bb9e7c39d25c68b48f059de5bdb6c950 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Mon, 2 Nov 2020 17:24:57 +0000 Subject: [PATCH 09/30] Update master --- user/billing-faq.md | 6 ++++++ user/billing-overview.md | 4 ++++ user/deployment/pages.md | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/user/billing-faq.md b/user/billing-faq.md index ba03694b2bd..9ed301c6f21 100644 --- a/user/billing-faq.md +++ b/user/billing-faq.md @@ -90,3 +90,9 @@ To help you track the build credit consumption Travis CI system will send the no ## Are add-ons limited to a certain number of users? You can buy additional add-ons any time you feel it is needed. You and your organization’s members can use the bought add-ons with no limitations. + +## Why my credits balance is negative? + +Most probably your last build costed more than you had available in your credit balance. You won't be able to run any builds until your balance gets positive. Replenish your credits (the negative balance will be deducted upon arrival of new credits creating new balance - see our [billing overview](/user/billing-overview/#negative-credits). + + diff --git a/user/billing-overview.md b/user/billing-overview.md index 29144821b75..36abf9e00ea 100644 --- a/user/billing-overview.md +++ b/user/billing-overview.md @@ -101,6 +101,10 @@ You may disband your credits. It will happen when and is meant to prevent abusive usage of the system. +#### Negative Credits + +By design, the billing system allows the build job to be finished even if the possible cost of build job expressed in credits exceeds available credits balance. After such build being finished you may notice your credit balance being negative. **This is perfectly normal.** Whenever your credits get replenished, e.g. after purchasing an addon, the negative balance will be deducted from newly arriving credit pool. What remains is your available credits balance for your builds. + #### Credits vs. OSS Only Credits diff --git a/user/deployment/pages.md b/user/deployment/pages.md index f91219d223a..b2560358dda 100644 --- a/user/deployment/pages.md +++ b/user/deployment/pages.md @@ -23,7 +23,7 @@ deploy: github_token: $GITHUB_TOKEN # Set in the settings page of your repository, as a secure variable keep_history: true on: - branch: master + branch: main ``` {: data-file=".travis.yml"} From 97c37ffc88ff531a57adbd95f8f1fcc430a1c7c9 Mon Sep 17 00:00:00 2001 From: nrios14 <44674816+nrios14@users.noreply.github.com> Date: Tue, 3 Nov 2020 11:15:19 -0400 Subject: [PATCH 10/30] Update billing-faq.md Minor suggestions and some space corrections. --- user/billing-faq.md | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/user/billing-faq.md b/user/billing-faq.md index 9ed301c6f21..c608dcc1084 100644 --- a/user/billing-faq.md +++ b/user/billing-faq.md @@ -9,46 +9,46 @@ permalink: /user/billing-faq/ ## How can I get on an annual plan? -The annual based plans are available by contacting the Travis CI support team. +Annual based plans are available by contacting the Travis CI support team. ## How can I get on the usage based plan? -The usage based plan is available by contacting theTravis CI support team. +The usage based plans are available by contacting the Travis CI support team. -## How are the credits deducted? +## How are credits deducted? -The credits will be deducted from the credits pool after each build job is executed depending on the operation system used. +Depending on the operating system used, credits are deducted from the respective credits pool after each build job is executed. -## How can I check how much I will pay for user licenses at the end of the month? +## How can I check how much I will pay for user licenses at the end of the month? -The unique users triggering builds within a billing period will constitute a number of actual user licenses used and will be charged at the end of the billing period, according to the rates in a selected plan. +The unique users triggering builds within a billing period will constitute the number of actual user licenses used and will be charged at the end of the billing period, according to the rates in the selected plan. -By default Travis CI system provides the possibility to trigger a build to all members of your team on GitHub, Bitbucket, GitLab and Assembla who have writing rights on repositories. +By default Travis CI system provides the possibility to trigger a build to all members of your team either on GitHub, Bitbucket, GitLab or Assembla who have writing rights on repositories. If the team member has not triggered the build during the billing period Travis CI will not charge you for that user. -To check how much active users you got during the last billing cycle please contact the support. -Travis CI is working on the user management functionality where you will be able: +To check how much active users you got during the last billing cycle please contact the Travis CI support team. +Travis CI is working on the user management functionality where you will be able to: -* To see how many users has rights to trigger the build -* To see how many was active/trigger the build during the last month -* Select the users who are able to trigger the build +* See how many users have rights to trigger the build. +* See how many users were active (triggering the build) during the last month. +* Select the users who are able to trigger the build. ## What if I am building open source? -Each of the Travis CI Plans can have an amount of special OSS credits per month assigned to run builds only on public repositories. To find out more about it please contact the Travis CI support team. +Each of the Travis CI Plans has an amount of special OSS credits assigned per month to run builds only on public repositories. To find out more about it please contact the Travis CI support team. ## How do I use credits? You can use your credits to run builds on your public and private repositories. -You may have been assigned an amount of OSS credits to run builds on public repositories. When you run out of OSS credits but want to keep building on public repositories you can go to the Plan page and turn the Credits consumption for OSS switcher to `On`. In this case, once the ‘OSS credits’ pool is depleted, the system starts deducting from the ‘paid credits’ pool. Builds for OSS repositories will be allowed to start, and deducted from the paid credits. +You will be assigned a certain amount of OSS credits to run builds on public repositories. When you run out of OSS credits but want to keep building on public repositories, go to our Plan page and turn the Credits consumption for OSS switcher to `On`. Once the ‘OSS credits’ pool is depleted, the system starts deducting from the ‘paid credits’ pool. Builds for OSS repositories will be allowed to start, and deducted from the paid credits. ## How do I recharge my credits balance? -You can buy additional build credits anytime you need them by clicking on your profile icon in the right upper corner of the screen =>Settings, navigate to the Plan page and press the ‘Buy add-ons’ button. -Please be advised that it is not possible to buy additional credits on Free Plan. +You can buy additional build credits anytime you want by clicking on your profile icon, selecting the =>Settings option, navigate to the Plan tab and press the ‘Buy add-ons’ button. +Please be advised that it is not possible to buy additional credits on the Free Plan. ## Do credits expire? @@ -57,42 +57,42 @@ No, the credits you purchased do not expire. ## Can you send me an invoice? -The invoice is sent automatically by the Travis CI system after the Plan purchase or subsequent user license charge is made. +The invoice is sent automatically by the Travis CI system after a Plan is purchased or a subsequent user license charge is made. ## Can I get a refund? Upon cancellation of your account or switching back to the Free Plan, you can request a refund under the following conditions: -* You haven’t used any paid credits -* Request made up to and including 14 days after the billing date: applicable for full refund +* You haven’t used any paid credits. +* The cancellation request is made up to and including 14 days after the billing date: applicable for full refund. -Contact our support team at support@travis-ci.com Specify the GitHub/Bitbucket/GitLab/Assembla handle of the account for which you’re requesting a refund, and send us a copy of your payment and/or invoice. +Contact our support team at support@travis-ci.com, specifing the GitHub/Bitbucket/GitLab/Assembla handle of the account for which you’re requesting a refund, and send us a copy of your payment and/or invoice. ## How do I cancel my paid plan? -If you want to cancel your paid plan, click on your profile icon in the right upper corner of the screen =>Settings, navigate to the Plan page and press the ‘Change Plan’ button and choose the Free Plan. -Travis CI Free plan will provide you with 10,000 build credits to try it out for public and private repositories builds and unlimited number of users with no charge. -If you want your account to be deleted, please contact the Travis CI support. +If you want to cancel your paid plan, click on your profile icon, select the =>Settings option, navigate to the Plan tab, press the ‘Change Plan’ button and choose the Free Plan. +The Travis CI Free plan provides you with 10,000 build credits to try it out for public and private repositories builds and an unlimited number of users without charge. +If you want your account to be deleted, please contact the Travis CI support team. ## Do these prices include tax? -No, all prices do not include tax. +No, all our prices do not include tax. ## Can I sign up for automatic renewals for usage based plan? The per-seats licence invoice will be charged and sent automatically after each month you use the Travis CI service, based on the maximum number of unique users who triggered the build during the given month. Unfortunately, right now it is not possible to configure automatic renewals for build credits. You need to manually buy credits each time you are about to run out of them. We intend to make it more convenient in the near future. -To help you track the build credit consumption Travis CI system will send the notification emails each time your credit balance is used up by 50, 75 and 100%. +To help you track the build credit consumption, Travis CI system will send notification emails each time your credit balance is used up by 50, 75 and 100%. ## Are add-ons limited to a certain number of users? -You can buy additional add-ons any time you feel it is needed. You and your organization’s members can use the bought add-ons with no limitations. +You can buy additional add-ons any time you need them. You and your organization's members can use the acquired add-ons without limitations. -## Why my credits balance is negative? +## Why is my credits balance negative? -Most probably your last build costed more than you had available in your credit balance. You won't be able to run any builds until your balance gets positive. Replenish your credits (the negative balance will be deducted upon arrival of new credits creating new balance - see our [billing overview](/user/billing-overview/#negative-credits). +Most probably your last build costed more than you had available in your credits balance. You won't be able to run any builds until your balance is back to positive. Replenish your credits to deduct the negative balance with the purchase of new credits creating new positive balance - see our [billing overview](/user/billing-overview/#negative-credits). From e585e836a23def22c37464a141a65ddb57149626 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Tue, 3 Nov 2020 17:25:55 +0000 Subject: [PATCH 11/30] Update master --- user/billing-faq.md | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/user/billing-faq.md b/user/billing-faq.md index c608dcc1084..9ed301c6f21 100644 --- a/user/billing-faq.md +++ b/user/billing-faq.md @@ -9,46 +9,46 @@ permalink: /user/billing-faq/ ## How can I get on an annual plan? -Annual based plans are available by contacting the Travis CI support team. +The annual based plans are available by contacting the Travis CI support team. ## How can I get on the usage based plan? -The usage based plans are available by contacting the Travis CI support team. +The usage based plan is available by contacting theTravis CI support team. -## How are credits deducted? +## How are the credits deducted? -Depending on the operating system used, credits are deducted from the respective credits pool after each build job is executed. +The credits will be deducted from the credits pool after each build job is executed depending on the operation system used. -## How can I check how much I will pay for user licenses at the end of the month? +## How can I check how much I will pay for user licenses at the end of the month? -The unique users triggering builds within a billing period will constitute the number of actual user licenses used and will be charged at the end of the billing period, according to the rates in the selected plan. +The unique users triggering builds within a billing period will constitute a number of actual user licenses used and will be charged at the end of the billing period, according to the rates in a selected plan. -By default Travis CI system provides the possibility to trigger a build to all members of your team either on GitHub, Bitbucket, GitLab or Assembla who have writing rights on repositories. +By default Travis CI system provides the possibility to trigger a build to all members of your team on GitHub, Bitbucket, GitLab and Assembla who have writing rights on repositories. If the team member has not triggered the build during the billing period Travis CI will not charge you for that user. -To check how much active users you got during the last billing cycle please contact the Travis CI support team. -Travis CI is working on the user management functionality where you will be able to: +To check how much active users you got during the last billing cycle please contact the support. +Travis CI is working on the user management functionality where you will be able: -* See how many users have rights to trigger the build. -* See how many users were active (triggering the build) during the last month. -* Select the users who are able to trigger the build. +* To see how many users has rights to trigger the build +* To see how many was active/trigger the build during the last month +* Select the users who are able to trigger the build ## What if I am building open source? -Each of the Travis CI Plans has an amount of special OSS credits assigned per month to run builds only on public repositories. To find out more about it please contact the Travis CI support team. +Each of the Travis CI Plans can have an amount of special OSS credits per month assigned to run builds only on public repositories. To find out more about it please contact the Travis CI support team. ## How do I use credits? You can use your credits to run builds on your public and private repositories. -You will be assigned a certain amount of OSS credits to run builds on public repositories. When you run out of OSS credits but want to keep building on public repositories, go to our Plan page and turn the Credits consumption for OSS switcher to `On`. Once the ‘OSS credits’ pool is depleted, the system starts deducting from the ‘paid credits’ pool. Builds for OSS repositories will be allowed to start, and deducted from the paid credits. +You may have been assigned an amount of OSS credits to run builds on public repositories. When you run out of OSS credits but want to keep building on public repositories you can go to the Plan page and turn the Credits consumption for OSS switcher to `On`. In this case, once the ‘OSS credits’ pool is depleted, the system starts deducting from the ‘paid credits’ pool. Builds for OSS repositories will be allowed to start, and deducted from the paid credits. ## How do I recharge my credits balance? -You can buy additional build credits anytime you want by clicking on your profile icon, selecting the =>Settings option, navigate to the Plan tab and press the ‘Buy add-ons’ button. -Please be advised that it is not possible to buy additional credits on the Free Plan. +You can buy additional build credits anytime you need them by clicking on your profile icon in the right upper corner of the screen =>Settings, navigate to the Plan page and press the ‘Buy add-ons’ button. +Please be advised that it is not possible to buy additional credits on Free Plan. ## Do credits expire? @@ -57,42 +57,42 @@ No, the credits you purchased do not expire. ## Can you send me an invoice? -The invoice is sent automatically by the Travis CI system after a Plan is purchased or a subsequent user license charge is made. +The invoice is sent automatically by the Travis CI system after the Plan purchase or subsequent user license charge is made. ## Can I get a refund? Upon cancellation of your account or switching back to the Free Plan, you can request a refund under the following conditions: -* You haven’t used any paid credits. -* The cancellation request is made up to and including 14 days after the billing date: applicable for full refund. +* You haven’t used any paid credits +* Request made up to and including 14 days after the billing date: applicable for full refund -Contact our support team at support@travis-ci.com, specifing the GitHub/Bitbucket/GitLab/Assembla handle of the account for which you’re requesting a refund, and send us a copy of your payment and/or invoice. +Contact our support team at support@travis-ci.com Specify the GitHub/Bitbucket/GitLab/Assembla handle of the account for which you’re requesting a refund, and send us a copy of your payment and/or invoice. ## How do I cancel my paid plan? -If you want to cancel your paid plan, click on your profile icon, select the =>Settings option, navigate to the Plan tab, press the ‘Change Plan’ button and choose the Free Plan. -The Travis CI Free plan provides you with 10,000 build credits to try it out for public and private repositories builds and an unlimited number of users without charge. -If you want your account to be deleted, please contact the Travis CI support team. +If you want to cancel your paid plan, click on your profile icon in the right upper corner of the screen =>Settings, navigate to the Plan page and press the ‘Change Plan’ button and choose the Free Plan. +Travis CI Free plan will provide you with 10,000 build credits to try it out for public and private repositories builds and unlimited number of users with no charge. +If you want your account to be deleted, please contact the Travis CI support. ## Do these prices include tax? -No, all our prices do not include tax. +No, all prices do not include tax. ## Can I sign up for automatic renewals for usage based plan? The per-seats licence invoice will be charged and sent automatically after each month you use the Travis CI service, based on the maximum number of unique users who triggered the build during the given month. Unfortunately, right now it is not possible to configure automatic renewals for build credits. You need to manually buy credits each time you are about to run out of them. We intend to make it more convenient in the near future. -To help you track the build credit consumption, Travis CI system will send notification emails each time your credit balance is used up by 50, 75 and 100%. +To help you track the build credit consumption Travis CI system will send the notification emails each time your credit balance is used up by 50, 75 and 100%. ## Are add-ons limited to a certain number of users? -You can buy additional add-ons any time you need them. You and your organization's members can use the acquired add-ons without limitations. +You can buy additional add-ons any time you feel it is needed. You and your organization’s members can use the bought add-ons with no limitations. -## Why is my credits balance negative? +## Why my credits balance is negative? -Most probably your last build costed more than you had available in your credits balance. You won't be able to run any builds until your balance is back to positive. Replenish your credits to deduct the negative balance with the purchase of new credits creating new positive balance - see our [billing overview](/user/billing-overview/#negative-credits). +Most probably your last build costed more than you had available in your credit balance. You won't be able to run any builds until your balance gets positive. Replenish your credits (the negative balance will be deducted upon arrival of new credits creating new balance - see our [billing overview](/user/billing-overview/#negative-credits). From ae86a362ad32e1ecf3dee7988e64d7e0d57f4e9a Mon Sep 17 00:00:00 2001 From: nrios14 <44674816+nrios14@users.noreply.github.com> Date: Tue, 3 Nov 2020 21:32:41 -0400 Subject: [PATCH 12/30] Update billing-overview.md Some English changes --- user/billing-overview.md | 62 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/user/billing-overview.md b/user/billing-overview.md index 36abf9e00ea..19ad335bfd1 100644 --- a/user/billing-overview.md +++ b/user/billing-overview.md @@ -18,24 +18,24 @@ The variety of plans provides you with flexibility to choose the plan that suits |:------- |:-----------------:|:-----------:| |Month | Concurrent jobs limit
      Unlimited build minutes on Linux, Windows, and FreeBSD
      Paid macOS builds (credits)

      Available via [site](https://travis-ci.com/account/plan) | Very high or no concurrency limit
      Paid macOS, Linux, Windows, and FreeBSD build minutes (credits)
      Paid user licenses (only per users trigerring the builds)

      Contact Travis CI to obtain| -For majority of users one of concurrency based plans should be sufficient. However if you build a lot of minutes per month and concurrency becomes a bottleneck, please contact Travis CI asking for Usage based plan. +For the majority of users one of the concurrency based plans should be sufficient. However, if you build a lot of minutes per month and concurrency becomes a bottleneck, please contact Travis CI asking for a switch to the Usage based plan. -A 'Free' Plan, assigned automatically to every new sign up, is Usage based plan with no limits on users and a trial pool of credits to be used. +A 'Free' Plan, is assigned automatically to every new sign up, is Usage based plan without limits on users and with a trial pool of credits to be used. ## Concurrency based plans -Concurrency based plans is much like what Travis CI has been oferring already for a long time: an ability to run a build consisting of X concurrent jobs. +Concurrency based plans are much like what Travis CI offered already for a long time: the ability to run a build consisting of an X amount of concurrent jobs. In Travis CI builds are executed singularly, without exceeding limitations. Therefore, if executing multiple builds at the same time or executing a build with multiple build jobs, once the concurrency limit is reached, the reminder builds/jobs must wait until there is a queue capacity available for processing. > If a user on the 2 concurrent jobs plan executes a build with 5 build jobs, only the first 2 builds are processed while the remaining 3 of the builds wait in line to be processed. > > If a user/organization subscribes to the 5 concurrent jobs plan and executes 2 builds consisting of 5 jobs each, the second build will be sitting in the queue and waiting to be executed after the 5 jobs of the first build are done. -Linux, Windows and FreeBSD builds are included in the price on these plans. The macOS builds are paid separately on concurrency plans, and can be run after purchasing the separate credits add-on. -Credits are used to pay for each build job minute on macOS. Purchase only the credits you need and use them until you run out. Please see more in 'Usage based' section. +Linux, Windows and FreeBSD builds are included in the price on these plans. The macOS builds are paid separately on concurrency plans, and can be run after purchasing the separate add-on credits. +Credits are used to pay for each build job minute run on macOS. Purchase only the credits you need and use them until you run out. Please see more in the 'Usage based' section. -> If a user/organization on the 2 concurrent jobs Plan executes build with jobs for `os: linux` and `os: freebsd` it will execute as soon as the concurrency capacity is available for particular build jobs. +> If a user/organization on the 2 concurrent jobs Plan executes a build with jobs for `os: linux` and `os: freebsd` it will execute as soon as the concurrency capacity is available for particular build jobs. > > If a user/organization on the same Plan tries to execute a job for `os: macOS` and has no credits available (see your [Plans](https://travis-ci.com/account/plan)), this build will not execute. In order to overcome that, an add-on must be purchased, e.g. 25k credits. Now the build can be executed and pre-defined amount of [credits will be charged for each build minute](/user/billing-overview/#usage---credits). @@ -49,11 +49,11 @@ Credits are used to pay for each build job minute on macOS. Purchase only the cr | **Build job limits** | As per Plan | -### Concurrency Plan - How to obtain? +### Concurrency Plan - How to obtain it? 1. Sign in to Travis CI with [Version Control System of your choice](/user/tutorial/). -2. Navigate to the [Plans](https://travis-ci.com/account/plan) and select of of 'X concurrent jobs Plan'. -3. Enter your billing details. **Please note, that all prices are provided netto, w/o any VAT or other applicable local taxes**. If you are EU based VAT paying company, do not forget to enter your VAT number. +2. Navigate to the [Plans](https://travis-ci.com/account/plan) section and select an 'X concurrent jobs Plan'. +3. Enter your billing details. **Please note, that all prices are provided netto, w/o any VAT or other applicable local taxes**. If you are an EU based VAT paying company, do not forget to enter your VAT number. 4. Confirm transaction. @@ -66,19 +66,19 @@ The usage based pricing system charges users and organizations depending on the The usage based pricing is a pre-paid model for credits and subscriptions for per-user-license. In other words, users and organizations can run as many build jobs as they want at the same time, meaning that all builds are executed as soon as possible without limitations. The final cost is flexible and closely related to the actual usage of the system, allowing you to downscale or upscale as per your needs. -> The usage based pricing model bills based on minutes used (via credits) and number of users executing those builds (via user licenses). Users subscribe to a plan that provides them an allocation of credits to be used towards build minutes and a pricing for specific number of user licenses. The credits are deducted from the users credit balance as they are used in the Travis CI service. +> The usage based pricing model bills based on minutes used (via credits) and based on the number of users executing those builds (via user licenses). Users subscribe to a plan that provides them an allocation of credits to be used towards build minutes and a pricing for specific number of user licenses. The credits are deducted from the users credit balance as they are used in the Travis CI service. Unique users triggering builds within a billing period will constitute a number of actual user licenses used and will be charged at the end of the billing period, according to the rates of their selected plan. ### Usage - Credits -Credits are purchased at your discretion as an 'addon'. The Plan you are on determines what selection addons is available for you. Credit addons are paid in advance. +Credits are purchased at your discretion as an 'add-on'. The Plan you are on determines what selection of add-ons are available for you. Credit add-ons are paid in advance. Thus whenever you select or are assigned an Usage based plan: -* Plan has the default allotment of credits associated (default Credits addon) -* Only advance charge is related to the allotment of credits available initially in the Plan, e.g. Plan coming with 25,000 credits will result in immediate charge according to the enlisted price +* Your plan has the default allotment of credits associated (default Credits add-on). +* Only advance charge is related to the allotment of credits available initially in the Plan, e.g. Plan coming with 25,000 credits will result in immediate charge according to the enlisted price. -Credits are deducted from your balance each time a build job ends either with some result or is cancelled manually by you. Each started build job minute has a credit cost associated with the environment as per table below. +Credits are deducted from your balance each time a build job ends either with some result or by manual cancellation. Each started build job minute has a credit cost associated with the environment as per shown in table below: | OS | # Credits per
      started build minute | |:--------------------:|:-----------:| @@ -87,13 +87,13 @@ Credits are deducted from your balance each time a build job ends either with so | Windows | 20 | | MacOS | 50 | -Build job minutes are counted from the moment when [VM or LXD container](/user/reference/overview/#virtualization-environments) is spun up, thus queue waiting time or spinning-up time are not taken into the account when calculating job duration time. +Build job minutes are counted from the moment a [VM or LXD container](/user/reference/overview/#virtualization-environments) is spun up, thus the queue waiting time or spinning-up time are not taken into the account when calculating the job duration time. -Additional credits can be purchased at any time. Credits are replenished by purchasing credits addon. +Additional credits can be purchased at any time. Credits are replenished by purchasing credits add-on. -> Automated credits purchasing is not available yet, please follow our blog and twitter for updates. +> Automated credits purchasing is not available yet, for updates please follow our blog and twitter account. -Your credits remain available until you use them or disband them. At the moment we do not discard unusued paid credits after 12 months, yet this may be a subject to change on short notice. +Your credits remain available until you use them or disband them. At the moment we do not discard unusued paid credits after 12 months, yet this may be subject to change on short notice. You may disband your credits. It will happen when @@ -103,7 +103,7 @@ and is meant to prevent abusive usage of the system. #### Negative Credits -By design, the billing system allows the build job to be finished even if the possible cost of build job expressed in credits exceeds available credits balance. After such build being finished you may notice your credit balance being negative. **This is perfectly normal.** Whenever your credits get replenished, e.g. after purchasing an addon, the negative balance will be deducted from newly arriving credit pool. What remains is your available credits balance for your builds. +By design, the billing system allows the build job to finish even if the possible cost of build job expressed in credits exceeds the available credits balance. After such build finishes, you may notice your credit balance becomes negative. **This is perfectly normal.** Whenever your credits get replenished, e.g. after purchasing an add-on, the negative balance will be deducted from the recently purchased credits. What remains is your available credits balance for your builds. #### Credits vs. OSS Only Credits @@ -111,35 +111,35 @@ By design, the billing system allows the build job to be finished even if the po Credits can be used to build both over private and public repositories. On occassion, an allotment of OSS Only credits may be granted by Travis CI. These credits may be used only for builds over public repositories and are meant for open source support. -The OSS credits may be assigned as one time pool or renewable pool, subject to case by case assesment of Travis CI staff. +The OSS credits may be assigned as a one time pool or a renewable pool, subject to a case by case assesment of Travis CI staff. -The OSS credits is a pool of credits completely separate from regular credits, with separate credits balance tracking. +The OSS credits is a pool of credits completely separate from regular credits, with a separate credits balance tracking. ### Usage - User Licenses -Usage based plan charges you at the end of each month for the number of users who triggered the builds during this month. +The Usage based plan charges you at the end of each month for the number of users who triggered the builds during this month. -With every build started, Travis CI keeps track of how many unique users triggered a build within current billing period. At the end of the month the total amount is used to calculate the user license charge. +With every build started, Travis CI keeps track of how many unique users trigger a build within the current billing period. At the end of the month, the total amount is used to calculate the user license charge. -> If a person A triggers a build, and a person B triggers a build, the billing system will recognize 2 unique users. Now if person A or B again triggers a build, the amount of unique users trigerring remains 2 (assuming builds are trigerred within the same billing period). Only when user C triggers a build within the same billing period the amount of unique users triggering a build will be increased to 3. +> If person A triggers a build, and person B triggers a build, the billing system will recognize 2 unique users. Now, if person A or B triggers a build again, the amount of unique users trigerring remains 2 (assuming builds are trigerred within the same billing period). Only when user C triggers a build within the same billing period the amount of unique users triggering a build is increased to 3. > -> By default, all users you've granted write rights to your repository are allowed to trigger a build. We are preparing a separate page in your Travis CI account page, which will allow you to manage which users exactly are allowed to trigger the build in order to give you more control. Please watch out for updates. +> By default, all users you've granted writing rights to your repository are allowed to trigger a build. We are preparing a separate page in your Travis CI account page, which will allow you to manage exactly which users are allowed to trigger the build. Please be on the watch for updates. ### Usage based Plan - Summary | Area | Details | | :--- | --- | -| **Payment** | Credits are paid in advance:
      1. Upon purchasing a Plan, an immediate charge is applied depending on credits allotment coming with a Plan.
      2. The additional credit addons can be purchased at any time and credits used only when you need them. Charge is applied immediately upon transaction.

      The user license cost is charged automatically in arrears, at the end of each billing period. The number of unique users trigerring a build is charged according to the license rates. | +| **Payment** | Credits are paid in advance:
      1. Upon purchasing a Plan, an immediate charge is applied depending on the credits allotment that come with a Plan.
      2. The additional credit add-ons can be purchased at any time and the credits used only when you need them. Charge is applied immediately upon transaction.

      The user license cost is charged automatically in arrears, at the end of each billing period. The number of unique users trigerring a build is charged according to the license rates. | | **Private/Public repositories** | With Credits you can build over both private and public repositories.
      With OSS Credits you can build only over public repositories. | -| **Build job limits** | None or very high.

      The Free Plan assigned automatically upon sign-up has a limit of 20 concurrent jobs. | +| **Build job limits** | None or very high.

      The Free Plan is assigned automatically upon sign-up and has a limit of 20 concurrent jobs. | -### Usage based Plan - How to obtain? +### Usage based Plan - How to obtain it? -1. Sign in to Travis CI with [Version Control System of your choice](/user/tutorial/). -2. Navigate to the [Plans](https://travis-ci.com/account/plan) and make sure you have your billing and contact details filled in correctly. -3. Contact [Travis CI support](mailto:support@travis-ci.com) requesting Usage based Plan. +1. Sign in to Travis CI with the [Version Control System of your choice](/user/tutorial/). +2. Navigate to the [Plans](https://travis-ci.com/account/plan) page and make sure you have your billing and contact details filled in correctly. +3. Contact [Travis CI support](mailto:support@travis-ci.com) requesting a Usage based Plan. ## Getting Help From 8507b6349ace7ee07cd34055a724a108737161de Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Wed, 4 Nov 2020 17:26:09 +0000 Subject: [PATCH 13/30] Update master --- user/billing-overview.md | 62 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/user/billing-overview.md b/user/billing-overview.md index 19ad335bfd1..36abf9e00ea 100644 --- a/user/billing-overview.md +++ b/user/billing-overview.md @@ -18,24 +18,24 @@ The variety of plans provides you with flexibility to choose the plan that suits |:------- |:-----------------:|:-----------:| |Month | Concurrent jobs limit
      Unlimited build minutes on Linux, Windows, and FreeBSD
      Paid macOS builds (credits)

      Available via [site](https://travis-ci.com/account/plan) | Very high or no concurrency limit
      Paid macOS, Linux, Windows, and FreeBSD build minutes (credits)
      Paid user licenses (only per users trigerring the builds)

      Contact Travis CI to obtain| -For the majority of users one of the concurrency based plans should be sufficient. However, if you build a lot of minutes per month and concurrency becomes a bottleneck, please contact Travis CI asking for a switch to the Usage based plan. +For majority of users one of concurrency based plans should be sufficient. However if you build a lot of minutes per month and concurrency becomes a bottleneck, please contact Travis CI asking for Usage based plan. -A 'Free' Plan, is assigned automatically to every new sign up, is Usage based plan without limits on users and with a trial pool of credits to be used. +A 'Free' Plan, assigned automatically to every new sign up, is Usage based plan with no limits on users and a trial pool of credits to be used. ## Concurrency based plans -Concurrency based plans are much like what Travis CI offered already for a long time: the ability to run a build consisting of an X amount of concurrent jobs. +Concurrency based plans is much like what Travis CI has been oferring already for a long time: an ability to run a build consisting of X concurrent jobs. In Travis CI builds are executed singularly, without exceeding limitations. Therefore, if executing multiple builds at the same time or executing a build with multiple build jobs, once the concurrency limit is reached, the reminder builds/jobs must wait until there is a queue capacity available for processing. > If a user on the 2 concurrent jobs plan executes a build with 5 build jobs, only the first 2 builds are processed while the remaining 3 of the builds wait in line to be processed. > > If a user/organization subscribes to the 5 concurrent jobs plan and executes 2 builds consisting of 5 jobs each, the second build will be sitting in the queue and waiting to be executed after the 5 jobs of the first build are done. -Linux, Windows and FreeBSD builds are included in the price on these plans. The macOS builds are paid separately on concurrency plans, and can be run after purchasing the separate add-on credits. -Credits are used to pay for each build job minute run on macOS. Purchase only the credits you need and use them until you run out. Please see more in the 'Usage based' section. +Linux, Windows and FreeBSD builds are included in the price on these plans. The macOS builds are paid separately on concurrency plans, and can be run after purchasing the separate credits add-on. +Credits are used to pay for each build job minute on macOS. Purchase only the credits you need and use them until you run out. Please see more in 'Usage based' section. -> If a user/organization on the 2 concurrent jobs Plan executes a build with jobs for `os: linux` and `os: freebsd` it will execute as soon as the concurrency capacity is available for particular build jobs. +> If a user/organization on the 2 concurrent jobs Plan executes build with jobs for `os: linux` and `os: freebsd` it will execute as soon as the concurrency capacity is available for particular build jobs. > > If a user/organization on the same Plan tries to execute a job for `os: macOS` and has no credits available (see your [Plans](https://travis-ci.com/account/plan)), this build will not execute. In order to overcome that, an add-on must be purchased, e.g. 25k credits. Now the build can be executed and pre-defined amount of [credits will be charged for each build minute](/user/billing-overview/#usage---credits). @@ -49,11 +49,11 @@ Credits are used to pay for each build job minute run on macOS. Purchase only th | **Build job limits** | As per Plan | -### Concurrency Plan - How to obtain it? +### Concurrency Plan - How to obtain? 1. Sign in to Travis CI with [Version Control System of your choice](/user/tutorial/). -2. Navigate to the [Plans](https://travis-ci.com/account/plan) section and select an 'X concurrent jobs Plan'. -3. Enter your billing details. **Please note, that all prices are provided netto, w/o any VAT or other applicable local taxes**. If you are an EU based VAT paying company, do not forget to enter your VAT number. +2. Navigate to the [Plans](https://travis-ci.com/account/plan) and select of of 'X concurrent jobs Plan'. +3. Enter your billing details. **Please note, that all prices are provided netto, w/o any VAT or other applicable local taxes**. If you are EU based VAT paying company, do not forget to enter your VAT number. 4. Confirm transaction. @@ -66,19 +66,19 @@ The usage based pricing system charges users and organizations depending on the The usage based pricing is a pre-paid model for credits and subscriptions for per-user-license. In other words, users and organizations can run as many build jobs as they want at the same time, meaning that all builds are executed as soon as possible without limitations. The final cost is flexible and closely related to the actual usage of the system, allowing you to downscale or upscale as per your needs. -> The usage based pricing model bills based on minutes used (via credits) and based on the number of users executing those builds (via user licenses). Users subscribe to a plan that provides them an allocation of credits to be used towards build minutes and a pricing for specific number of user licenses. The credits are deducted from the users credit balance as they are used in the Travis CI service. +> The usage based pricing model bills based on minutes used (via credits) and number of users executing those builds (via user licenses). Users subscribe to a plan that provides them an allocation of credits to be used towards build minutes and a pricing for specific number of user licenses. The credits are deducted from the users credit balance as they are used in the Travis CI service. Unique users triggering builds within a billing period will constitute a number of actual user licenses used and will be charged at the end of the billing period, according to the rates of their selected plan. ### Usage - Credits -Credits are purchased at your discretion as an 'add-on'. The Plan you are on determines what selection of add-ons are available for you. Credit add-ons are paid in advance. +Credits are purchased at your discretion as an 'addon'. The Plan you are on determines what selection addons is available for you. Credit addons are paid in advance. Thus whenever you select or are assigned an Usage based plan: -* Your plan has the default allotment of credits associated (default Credits add-on). -* Only advance charge is related to the allotment of credits available initially in the Plan, e.g. Plan coming with 25,000 credits will result in immediate charge according to the enlisted price. +* Plan has the default allotment of credits associated (default Credits addon) +* Only advance charge is related to the allotment of credits available initially in the Plan, e.g. Plan coming with 25,000 credits will result in immediate charge according to the enlisted price -Credits are deducted from your balance each time a build job ends either with some result or by manual cancellation. Each started build job minute has a credit cost associated with the environment as per shown in table below: +Credits are deducted from your balance each time a build job ends either with some result or is cancelled manually by you. Each started build job minute has a credit cost associated with the environment as per table below. | OS | # Credits per
      started build minute | |:--------------------:|:-----------:| @@ -87,13 +87,13 @@ Credits are deducted from your balance each time a build job ends either with so | Windows | 20 | | MacOS | 50 | -Build job minutes are counted from the moment a [VM or LXD container](/user/reference/overview/#virtualization-environments) is spun up, thus the queue waiting time or spinning-up time are not taken into the account when calculating the job duration time. +Build job minutes are counted from the moment when [VM or LXD container](/user/reference/overview/#virtualization-environments) is spun up, thus queue waiting time or spinning-up time are not taken into the account when calculating job duration time. -Additional credits can be purchased at any time. Credits are replenished by purchasing credits add-on. +Additional credits can be purchased at any time. Credits are replenished by purchasing credits addon. -> Automated credits purchasing is not available yet, for updates please follow our blog and twitter account. +> Automated credits purchasing is not available yet, please follow our blog and twitter for updates. -Your credits remain available until you use them or disband them. At the moment we do not discard unusued paid credits after 12 months, yet this may be subject to change on short notice. +Your credits remain available until you use them or disband them. At the moment we do not discard unusued paid credits after 12 months, yet this may be a subject to change on short notice. You may disband your credits. It will happen when @@ -103,7 +103,7 @@ and is meant to prevent abusive usage of the system. #### Negative Credits -By design, the billing system allows the build job to finish even if the possible cost of build job expressed in credits exceeds the available credits balance. After such build finishes, you may notice your credit balance becomes negative. **This is perfectly normal.** Whenever your credits get replenished, e.g. after purchasing an add-on, the negative balance will be deducted from the recently purchased credits. What remains is your available credits balance for your builds. +By design, the billing system allows the build job to be finished even if the possible cost of build job expressed in credits exceeds available credits balance. After such build being finished you may notice your credit balance being negative. **This is perfectly normal.** Whenever your credits get replenished, e.g. after purchasing an addon, the negative balance will be deducted from newly arriving credit pool. What remains is your available credits balance for your builds. #### Credits vs. OSS Only Credits @@ -111,35 +111,35 @@ By design, the billing system allows the build job to finish even if the possibl Credits can be used to build both over private and public repositories. On occassion, an allotment of OSS Only credits may be granted by Travis CI. These credits may be used only for builds over public repositories and are meant for open source support. -The OSS credits may be assigned as a one time pool or a renewable pool, subject to a case by case assesment of Travis CI staff. +The OSS credits may be assigned as one time pool or renewable pool, subject to case by case assesment of Travis CI staff. -The OSS credits is a pool of credits completely separate from regular credits, with a separate credits balance tracking. +The OSS credits is a pool of credits completely separate from regular credits, with separate credits balance tracking. ### Usage - User Licenses -The Usage based plan charges you at the end of each month for the number of users who triggered the builds during this month. +Usage based plan charges you at the end of each month for the number of users who triggered the builds during this month. -With every build started, Travis CI keeps track of how many unique users trigger a build within the current billing period. At the end of the month, the total amount is used to calculate the user license charge. +With every build started, Travis CI keeps track of how many unique users triggered a build within current billing period. At the end of the month the total amount is used to calculate the user license charge. -> If person A triggers a build, and person B triggers a build, the billing system will recognize 2 unique users. Now, if person A or B triggers a build again, the amount of unique users trigerring remains 2 (assuming builds are trigerred within the same billing period). Only when user C triggers a build within the same billing period the amount of unique users triggering a build is increased to 3. +> If a person A triggers a build, and a person B triggers a build, the billing system will recognize 2 unique users. Now if person A or B again triggers a build, the amount of unique users trigerring remains 2 (assuming builds are trigerred within the same billing period). Only when user C triggers a build within the same billing period the amount of unique users triggering a build will be increased to 3. > -> By default, all users you've granted writing rights to your repository are allowed to trigger a build. We are preparing a separate page in your Travis CI account page, which will allow you to manage exactly which users are allowed to trigger the build. Please be on the watch for updates. +> By default, all users you've granted write rights to your repository are allowed to trigger a build. We are preparing a separate page in your Travis CI account page, which will allow you to manage which users exactly are allowed to trigger the build in order to give you more control. Please watch out for updates. ### Usage based Plan - Summary | Area | Details | | :--- | --- | -| **Payment** | Credits are paid in advance:
      1. Upon purchasing a Plan, an immediate charge is applied depending on the credits allotment that come with a Plan.
      2. The additional credit add-ons can be purchased at any time and the credits used only when you need them. Charge is applied immediately upon transaction.

      The user license cost is charged automatically in arrears, at the end of each billing period. The number of unique users trigerring a build is charged according to the license rates. | +| **Payment** | Credits are paid in advance:
      1. Upon purchasing a Plan, an immediate charge is applied depending on credits allotment coming with a Plan.
      2. The additional credit addons can be purchased at any time and credits used only when you need them. Charge is applied immediately upon transaction.

      The user license cost is charged automatically in arrears, at the end of each billing period. The number of unique users trigerring a build is charged according to the license rates. | | **Private/Public repositories** | With Credits you can build over both private and public repositories.
      With OSS Credits you can build only over public repositories. | -| **Build job limits** | None or very high.

      The Free Plan is assigned automatically upon sign-up and has a limit of 20 concurrent jobs. | +| **Build job limits** | None or very high.

      The Free Plan assigned automatically upon sign-up has a limit of 20 concurrent jobs. | -### Usage based Plan - How to obtain it? +### Usage based Plan - How to obtain? -1. Sign in to Travis CI with the [Version Control System of your choice](/user/tutorial/). -2. Navigate to the [Plans](https://travis-ci.com/account/plan) page and make sure you have your billing and contact details filled in correctly. -3. Contact [Travis CI support](mailto:support@travis-ci.com) requesting a Usage based Plan. +1. Sign in to Travis CI with [Version Control System of your choice](/user/tutorial/). +2. Navigate to the [Plans](https://travis-ci.com/account/plan) and make sure you have your billing and contact details filled in correctly. +3. Contact [Travis CI support](mailto:support@travis-ci.com) requesting Usage based Plan. ## Getting Help From 3f148ab04e0021e8452c0d4add6f8e07fdc8b9e4 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Wed, 11 Nov 2020 17:29:52 +0000 Subject: [PATCH 14/30] Update master --- user/languages/java.md | 1 + 1 file changed, 1 insertion(+) diff --git a/user/languages/java.md b/user/languages/java.md index d40b54438b1..b35beed2ac9 100644 --- a/user/languages/java.md +++ b/user/languages/java.md @@ -195,6 +195,7 @@ details. The list of available JVMs for different dists are at + * [JDKs installed for **Focal**](/user/reference/focal/#jvm-clojure-groovy-java-scala-support) * [JDKs installed for **Bionic**](/user/reference/bionic/#jvm-clojure-groovy-java-scala-support) * [JDKs installed for **Xenial**](/user/reference/xenial/#jvm-clojure-groovy-java-scala-support) * [JDKs installed for **Trusty**](/user/reference/trusty/#jvm-clojure-groovy-java-scala-images) From 09a0ccd3c3c76861474801d32d828d60f1d43cf5 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Thu, 12 Nov 2020 17:30:01 +0000 Subject: [PATCH 15/30] Update master --- _data/snippets.yml | 28 +++++++++++++++++++ .../open-source-repository-migration.md | 6 +++- user/tutorial.md | 6 +++- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/_data/snippets.yml b/_data/snippets.yml index 48f2cd18409..a41b2558d40 100644 --- a/_data/snippets.yml +++ b/_data/snippets.yml @@ -114,3 +114,31 @@ enterprise_3_encryption_key_backup: | 1. Make sure you have appropriate access to the kubernetes cluster: you need credentials for `kubectl` and connection to [travis-api-pod] 2. Run `kubectl exec -it [travis-api-pod] cat /app/config/travis.yml |grep -A 2 encryption` (using Travis API pod is recommended). 3. Create a backup of the value returned by that command by either writing it down on a piece of paper or storing it on a different computer. +github_oauth_access_rights: | + When you sign in to [travis-ci.com](https://travis-ci.com) using GitHub for the first time, you will receive a message from GitHub saying: + + > Travis CI by travis-pro wants to access your [account name] account. + + and in the repositorie's section it will state: + + > This application will be able to read and write all public and private repository data. + + This is not how Travis CI access yout data, however we can explain it later in the process. + + The warning is triggerred due to GitHub OAuth App permissions which Travis CI uses, and due to the available granularity of permission scopes (see GitHub [Scopes for OAuth Apps documentation](https://docs.github.com/en/developers/apps/scopes-for-oauth-apps) ). + + **Travis CI does not access all your repositories by default**. + + Once you acknowledge the access rights, you will see Travis CI OAuth application present in your GitHub [Authorized OAuth Apps list](https://github.com/settings/applications), however **you need to explicitly configure which repositories Travis CI has access to** within your [travis-ci.com](https://travis-ci.com) account. The configuration is done during the activation of Travis CI for your repositories. You can use either the 'All repositories' option or the 'Only select repositories' option during the activation process. + + When the Travis CI activation has completed, you will see the actual Travis CI GitHub Application installed in [Installed GitHub Apps](https://github.com/settings/installations) section. + + Travis CI uses OAuth permissions in the following way: + + 1) Travis CI's system synchronizes certain metadata with GitHub. This metadata is required for proper service functioning. In particular, we sync users, orgs, memberships, repos, permissions and, (optionally) branches. This type of sync happens either once a day by schedule or per the user's request. You can find more information and source code [in this repository](https://github.com/travis-ci/travis-github-sync#syncs) + + 2) In order to run builds, Travis CI's system clones a repository, from which the build is triggered, to the build environment. The build environment is an isolated virtual machine or an LXD container, which gets terminated as soon as the build finishes. Cloning happens only after a build request, and therefore only for the repositories explicitly enabled at GitHub settings. + + 3) To set up a build environment and prepare the build, Travis CI's system fetches and processes the `.travis.yml` config file from the repository and the branch explicitly specified in the build request, triggered by GitHub. + + 4) Travis CI's system reports build results back to GitHub via its [Checks API](https://developer.github.com/v3/checks/). diff --git a/user/migrate/open-source-repository-migration.md b/user/migrate/open-source-repository-migration.md index 402f1507f71..e76c3cc6820 100644 --- a/user/migrate/open-source-repository-migration.md +++ b/user/migrate/open-source-repository-migration.md @@ -74,7 +74,7 @@ No. Unless there was something very customised in your `.travis.yml`, no changes If you are already using GitHub Apps for your account in travis-ci.com, you need to access your installation settings and grant access to the repositories you'd like to migrate. Otherwise: -1. Log in to [https://travis-ci.com] and access your profile (or your organization's) at [https://travis-ci.com/profile](https://travis-ci.com/profile) +1. Log in to [https://travis-ci.com] and access your profile (or your organization's) at [https://travis-ci.com/profile](https://travis-ci.com/profile). For any doubts on the Travis CI GitHub Authorized OAuth App access rights message, please read more details [below](/user/migrate/open-source-repository-migration#travis-ci-github-oauth-app-access-rights). 2. If you aren't using the new GitHub Apps integration already, activate it for your account ![Activate GitHub Apps](/user/images/oss-migration/gapps-activate.png) @@ -83,6 +83,10 @@ If you are already using GitHub Apps for your account in travis-ci.com, you need 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. +#### Travis CI GitHub OAuth App access rights + +{{ site.data.snippets.github_oauth_access_rights }} + ### The migration steps 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: diff --git a/user/tutorial.md b/user/tutorial.md index cb78739711e..e2a0511bafa 100644 --- a/user/tutorial.md +++ b/user/tutorial.md @@ -21,7 +21,7 @@ To start using Travis CI, make sure you have: 1. Go to [Travis-ci.com](https://travis-ci.com) and [*Sign up with GitHub*](https://travis-ci.com/signin). -2. Accept the Authorization of Travis CI. You'll be redirected to GitHub. +2. Accept the Authorization of Travis CI. You'll be redirected to GitHub. For any doubts on the Travis CI GitHub Authorized OAuth App access rights message, please read more details [below](/user/tutorial#travis-ci-github-oauth-app-access-rights) 3. Click on your profile picture in the top right of your Travis Dashboard, click Settings and then the green *Activate* button, and select the repositories you want to use with Travis CI. @@ -49,6 +49,10 @@ To start using Travis CI, make sure you have: 6. Check the build status page to see if your build [passes or fails](/user/job-lifecycle/#breaking-the-build) according to the return status of the build command by visiting [Travis CI](https://travis-ci.com/auth) and selecting your repository. +#### Travis CI GitHub OAuth App access rights + +{{ site.data.snippets.github_oauth_access_rights }} + ## To get started with Travis CI using Bitbucket
      From 182147e1292e54e4da333fadaed7fd5bc4daf0ba Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Fri, 13 Nov 2020 17:30:19 +0000 Subject: [PATCH 16/30] Update master --- user/languages/dart.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/languages/dart.md b/user/languages/dart.md index f43952098f8..3df78a289b7 100644 --- a/user/languages/dart.md +++ b/user/languages/dart.md @@ -25,7 +25,7 @@ language: dart This guide covers build environment and configuration topics specific to -[Dart](https://www.dartlang.org/) projects. Please make sure to read our +[Dart](https://dart.dev/) projects. Please make sure to read our [Tutorial](/user/tutorial/) and [general build configuration](/user/customizing-the-build/) guides first. From dcb0321c8795a882e9d68dd1c23f20aa8ce43d35 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Sat, 14 Nov 2020 17:31:32 +0000 Subject: [PATCH 17/30] Update master --- user/languages/julia.md | 6 +++--- user/languages/python.md | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/user/languages/julia.md b/user/languages/julia.md index eaac8475f6f..895b7de2da6 100644 --- a/user/languages/julia.md +++ b/user/languages/julia.md @@ -18,7 +18,7 @@ or altered at any time. If you run into any problems, please report them in the [Travis CI Julia Community Forums](https://travis-ci.community/c/languages/julia) and cc [@ararslan](https://github.com/ararslan), [@staticfloat](https://github.com/staticfloat), and [@StefanKarpinski](https://github.com/StefanKarpinski). -For general Julia support on Travis CI go to the [Travis Community](https://travis-ci.community/c/languages/julia) or [Julia Lang Slack Channel](https://julialang.slack.com) in the __#testing__ channel. +For general Julia support on Travis CI go to the [Travis Community](https://travis-ci.community/c/languages/julia) or [Julia Lang Slack Channel](https://julialang.org/slack/) in the __#testing__ channel. ## Choosing Julia versions to test against @@ -29,8 +29,8 @@ the Julia versions to test in the `julia:` key in your `.travis.yml` file. For e language: julia julia: - nightly - - 1.0.5 - - 1.3.1 + - 1.0.6 + - 1.5.2 ``` {: data-file=".travis.yml"} diff --git a/user/languages/python.md b/user/languages/python.md index 02c78d6c686..ef31cd17e80 100644 --- a/user/languages/python.md +++ b/user/languages/python.md @@ -203,6 +203,20 @@ install: pip install --user -r requirements.txt Please note that the `--user` option is mandatory if you are not using `language: python`, since no virtualenv will be created in that case. +#### New dependency resolver in `pip` 20.3 + +As described in the [PyPa](https://pip.pypa.io/en/latest/user_guide/#changes-to-the-pip-dependency-resolver-in-20-2-2020) announcement, `pip` version 20.3 will ship with a new dependency resolver. +This may have unexpected changes in your software; when we deploy new build images with this version at a future date, your builds may break due to the changes related to this version. + +To test the new dependency resolver's effects on your software, we advise you to test it with `pip` version 20.2. To do so, modify your build to update `pip` to version 20.2 and to invoke `pip` with `--use-feature=2020-resolver` flag. For example: + +```yaml +before_install: + - python -m pip install --upgrade pip +install: + - pip install --user -r requirements.txt --use-feature=2020-resolver +``` + ### Custom Dependency Management To override the default `pip` dependency management, alter the `before_install` From 9dbf23f60a490f109bedb99028a17ede2e1e439f Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Tue, 1 Dec 2020 17:42:13 +0000 Subject: [PATCH 18/30] Update master --- user/languages/python.md | 5 +++-- user/languages/rust.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/user/languages/python.md b/user/languages/python.md index ef31cd17e80..a495741961a 100644 --- a/user/languages/python.md +++ b/user/languages/python.md @@ -49,7 +49,8 @@ python: - "3.6" # current default Python on Travis CI - "3.7" - "3.8" - - "3.8-dev" # 3.8 development branch + - "3.9" + - "3.9-dev" # 3.9 development branch - "nightly" # nightly build # command to install dependencies install: @@ -123,7 +124,7 @@ a recent development version of [CPython](https://github.com/python/cpython) bui From Python 3.5 and later, Python In Development versions are available. You can specify these in your builds with `3.5-dev`, `3.6-dev`, -`3.7-dev` or `3.8-dev`. +`3.7-dev`, `3.8-dev` or `3.9-dev`. ## Default Build Script diff --git a/user/languages/rust.md b/user/languages/rust.md index 5082b8d0dd8..8b25e632afa 100644 --- a/user/languages/rust.md +++ b/user/languages/rust.md @@ -36,7 +36,7 @@ By default, we download and install the latest stable Rust release at the start of the build (thanks to `rustup`). The [`minimal` profile][profiles] is used and includes the following language tools `cargo`, `rustc`, and `rustup`. -[profiles]: https://github.com/rust-lang/rustup.rs#profiles +[profiles]: https://github.com/rust-lang/rustup/blob/master/doc/src/concepts/profiles.md If you want additional language tools like `rustfmt` or `clippy`, please install them in `before_install`. From 6690044c2e765cbe6af5e8e10c397d3606e9a24b Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Wed, 2 Dec 2020 17:44:36 +0000 Subject: [PATCH 19/30] Update master --- user/billing-faq.md | 5 ++++- user/billing-overview.md | 9 ++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/user/billing-faq.md b/user/billing-faq.md index 9ed301c6f21..37b10048112 100644 --- a/user/billing-faq.md +++ b/user/billing-faq.md @@ -37,7 +37,10 @@ Travis CI is working on the user management functionality where you will be able ## What if I am building open source? -Each of the Travis CI Plans can have an amount of special OSS credits per month assigned to run builds only on public repositories. To find out more about it please contact the Travis CI support team. +Each of the Travis CI Plans contains an amount of special OSS credits per month assigned to run builds only on public repositories. To find out more about it please [contact the Travis CI support team](mailto:support@travis-ci.com). In the email please include: + +* Your account name and your VCS provider (like travis-ci.com/github/[your account name] ) +* How many credits (build minutes) you’d like to request (should your run out of credits again you can repeat the process to request more or to discuss a renewable amount) ## How do I use credits? diff --git a/user/billing-overview.md b/user/billing-overview.md index 36abf9e00ea..8b88a77cda1 100644 --- a/user/billing-overview.md +++ b/user/billing-overview.md @@ -20,7 +20,9 @@ The variety of plans provides you with flexibility to choose the plan that suits For majority of users one of concurrency based plans should be sufficient. However if you build a lot of minutes per month and concurrency becomes a bottleneck, please contact Travis CI asking for Usage based plan. -A 'Free' Plan, assigned automatically to every new sign up, is Usage based plan with no limits on users and a trial pool of credits to be used. +### Free Plan + +A 'Free' Plan, assigned automatically to every new sign up, is a Usage based plan without limits on users and comes with a trial pool of credits to be used. Once these credits are used they are not replenished. Request [OSS Credits allowance](/user/billing-faq/#what-if-i-am-building-open-source) or please consider one of our available plans. ## Concurrency based plans @@ -116,6 +118,11 @@ The OSS credits may be assigned as one time pool or renewable pool, subject to c The OSS credits is a pool of credits completely separate from regular credits, with separate credits balance tracking. +#### Free Plan Credits + +Each new user gets automatically assigned to the Free Plan upon signing up. The Free plan contains a one time pool of Credits, not renewable. This plan is meant to let you familiarize with our usage based plans as well as to try out other Travis CI features. + + ### Usage - User Licenses Usage based plan charges you at the end of each month for the number of users who triggered the builds during this month. From 1c386425b8c8b4eabe70a75dd181a3946ab79c46 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Fri, 11 Dec 2020 17:47:46 +0000 Subject: [PATCH 20/30] Update master --- user/running-build-in-debug-mode.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/user/running-build-in-debug-mode.md b/user/running-build-in-debug-mode.md index 25ebee51203..1df689d1b0a 100644 --- a/user/running-build-in-debug-mode.md +++ b/user/running-build-in-debug-mode.md @@ -33,8 +33,8 @@ this button is not available and you will need to use an API call instead. To restart a job in debug mode via API, send a `POST` request to the job's `debug` endpoint. This request needs to be authenticated by adding your [Travis CI API token](/user/triggering-builds/) -to the `Authorization` header. You can find your API token in your Travis CI Profile page -for [public projects](https://travis-ci.com/profile). +to the `Authorization` header. You can find your API token in your Travis CI Account Preferences page +for [public projects](https://travis-ci.com/account/preferences). (Note the literal word `token` must be present before the actual authorization token.) From 174e07a0685edecb5aa7877bba0954128c56048f Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Sat, 12 Dec 2020 17:48:44 +0000 Subject: [PATCH 21/30] Update master --- .../language-details/archive_definitions.yml | 1 + user/common-build-problems.md | 2 +- user/deployment-v2.md | 2 +- user/languages/php.md | 35 +++++++++++++++++ user/multi-cpu-architectures.md | 2 +- user/reference/bionic.md | 38 +++++++++++++++++++ user/reference/focal.md | 38 +++++++++++++++++++ user/reference/xenial.md | 38 +++++++++++++++++++ user/sonarcloud.md | 2 +- 9 files changed, 154 insertions(+), 4 deletions(-) diff --git a/_data/language-details/archive_definitions.yml b/_data/language-details/archive_definitions.yml index aac4ccb1b4e..d282958269c 100644 --- a/_data/language-details/archive_definitions.yml +++ b/_data/language-details/archive_definitions.yml @@ -1,2 +1,3 @@ python: {} erlang: {} +php: {} diff --git a/user/common-build-problems.md b/user/common-build-problems.md index 54e506a2bb1..2242cc0dd80 100644 --- a/user/common-build-problems.md +++ b/user/common-build-problems.md @@ -608,7 +608,7 @@ jobs: ``` {: data-file=".travis.yml"} -The above definition, creates a stage called **Breakfast** and 2 jobs. The first job is an _implicit_ job that inherits all the default values for the programming language specified. In the example above, the [default values for `C`](user/languages/c/#what-this-guide-covers) will be used while the second job is the _Peanut Butter and Bread_, which you have explicitly defined. +The above definition, creates a stage called **Breakfast** and 2 jobs. The first job is an _implicit_ job that inherits all the default values for the programming language specified. In the example above, the [default values for `C`](/user/languages/c/#what-this-guide-covers) will be used while the second job is the _Peanut Butter and Bread_, which you have explicitly defined. To remove this _implicit_ job, you would edit the above to look like: diff --git a/user/deployment-v2.md b/user/deployment-v2.md index a45a3d1c08c..aa5d49c91df 100644 --- a/user/deployment-v2.md +++ b/user/deployment-v2.md @@ -17,7 +17,7 @@ Continuous Deployment to the following providers is supported:
    To deploy to a custom or unsupported provider, use the [after-success build -step](/user/deployment/custom/) or [script provider](/user/deployment/providers/script). +step](/user/deployment/custom/) or [script provider](/user/deployment/script). {% include deploy/pull_requests.md %} {% include deploy/maturity_levels.md %} diff --git a/user/languages/php.md b/user/languages/php.md index d09fa3e65fd..7f841c10f38 100644 --- a/user/languages/php.md +++ b/user/languages/php.md @@ -62,6 +62,13 @@ php: ``` {: data-file=".travis.yml"} +{% if site.data.language-details.php-versions.size > 0 %} +### Supported PHP versions + +The list of PHP versions available for on-demand installation can be found in +[the table below](#php-versions). + +{% else %} ### PHP 5.2(.x) - 5.3(.x) support is available on Precise only We do not support these versions on Trusty or Xenial or Bionic. @@ -84,6 +91,7 @@ See [this page](/user/reference/bionic#php-support) for more information. We do not support these versions on Precise. If you need to test them, please use Trusty, Xenial, or Bionic. +{% endif %} ### HHVM versions are available on Trusty only @@ -406,3 +414,30 @@ You can find more information on the build config format for [PHP](https://confi ## Examples - [Drupal](https://github.com/sonnym/travis-ci-drupal-module-example) + +{% if site.data.language-details.php-versions.size > 0 %} +## PHP versions +These archives are available for on-demand installation. + +{: #php-versions-table} +| Release | Arch | Name | +| :------------- | :------------- | :------- |{% for file in site.data.language-details.php-versions %} +| {{ file.release }} | {{ file.arch }} | {{ file.name }} |{% endfor %} +{% endif %} + + + diff --git a/user/multi-cpu-architectures.md b/user/multi-cpu-architectures.md index 2e7dbdb255a..ab92a89636a 100644 --- a/user/multi-cpu-architectures.md +++ b/user/multi-cpu-architectures.md @@ -175,7 +175,7 @@ script: docker run my/test #assuming docker image my/test is arm64v8 ready You can try it out also for `ppc64le` (IBM Power) and `s390x` (IBM Z) based docker builds, assuming all dependencies and/or a CPU architecture compliant base docker image are used. -You can also have a look at [Using Docker in Builds](user/docker/). +You can also have a look at [Using Docker in Builds](/user/docker/). ## LXD related limitations diff --git a/user/reference/bionic.md b/user/reference/bionic.md index 261606cfae2..a72000e90b5 100644 --- a/user/reference/bionic.md +++ b/user/reference/bionic.md @@ -94,6 +94,44 @@ For preinstalled language interpreters, a standard version manager like `rvm` is * shellcheck 0.7.0 * shfmt 2.6.3 +To use the IBM Advance Toolchain v14 compilers under `ppc64le` architecture in Focal LXD image, use the following paths in your `.travis.yml`: + +- GCC compiler + - Path: `/opt/at14.0/bin/gcc` + - Command: `/opt/at14.0/bin/gcc hello_world.c -o hello_world` + +- g++ compiler + - Path: `/opt/at14.0/bin/g++` + - Command: `/opt/at14.0/bin/g++ hello_world.cpp -o hello_world` + +- Go compiler + - Path: `/opt/at14.0/bin/gccgo` + - Command: `/opt/at14.0/bin/gccgo hello_world.go -o hello_world` + +- Python + - First, compile Python 3.8.0 using the `python_interpreter.sh script`. + - Python Interpreter Path: `/opt/python380-at14/python3.8` + - Build Python Command: `sudo sh python_interpreter.sh` + +To use the IBM Advance Toolchain v14 compilers under `amd64` architecture in Focal LXD image, use the following paths in your `.travis.yml`: + +- GCC compiler + - Path: `/opt/at14.0/bin/powerpc64le-linux-gnu-gcc` + - Command: `/opt/at14.0/bin/powerpc64le-linux-gnu-gcc hello_world.c -o hello_world` + +- g++ compiler + - Path: `/opt/at14.0/bin/powerpc64le-linux-gnu-g++` + Command: `/opt/at14.0/bin/powerpc64le-linux-gnu-g++ hello_world.cpp -o hello_world` + +- Go compiler + - Path: `/opt/at14.0/bin/powerpc64le-linux-gnu-gccgo` + - Command: `/opt/at14.0/bin/powerpc64le-linux-gnu-gccgo hello_world.go -o hello_world` + +- Python + - First, compile Python 3.8.0 using the `python_interpreter.sh script`. + - Python Interpreter Path: `/opt/python380-amd64/python3.8` + - Build Python Command: `sudo sh python_interpreter.sh` + ### Docker * Docker 18.06.0-ce is installed diff --git a/user/reference/focal.md b/user/reference/focal.md index f958b18e85c..2355d15b0d5 100644 --- a/user/reference/focal.md +++ b/user/reference/focal.md @@ -97,6 +97,44 @@ For preinstalled language interpreters, a standard version manager like `rvm` is | shfmt | `2.6.3` | {: style="width: 30%" } +To use the IBM Advance Toolchain v14 compilers under `ppc64le` architecture in Focal LXD image, use the following paths in your `.travis.yml`: + +- GCC compiler + - Path: `/opt/at14.0/bin/gcc` + - Command: `/opt/at14.0/bin/gcc hello_world.c -o hello_world` + +- g++ compiler + - Path: `/opt/at14.0/bin/g++` + - Command: `/opt/at14.0/bin/g++ hello_world.cpp -o hello_world` + +- Go compiler + - Path: `/opt/at14.0/bin/gccgo` + - Command: `/opt/at14.0/bin/gccgo hello_world.go -o hello_world` + +- Python + - First, compile Python 3.8.0 using the `python_interpreter.sh script`. + - Python Interpreter Path: `/opt/python380-at14/python3.8` + - Build Python Command: `sudo sh python_interpreter.sh` + +To use the IBM Advance Toolchain v14 compilers under `amd64` architecture in Focal LXD image, use the following paths in your `.travis.yml`: + +- GCC compiler + - Path: `/opt/at14.0/bin/powerpc64le-linux-gnu-gcc` + - Command: `/opt/at14.0/bin/powerpc64le-linux-gnu-gcc hello_world.c -o hello_world` + +- g++ compiler + - Path: `/opt/at14.0/bin/powerpc64le-linux-gnu-g++` + Command: `/opt/at14.0/bin/powerpc64le-linux-gnu-g++ hello_world.cpp -o hello_world` + +- Go compiler + - Path: `/opt/at14.0/bin/powerpc64le-linux-gnu-gccgo` + - Command: `/opt/at14.0/bin/powerpc64le-linux-gnu-gccgo hello_world.go -o hello_world` + +- Python + - First, compile Python 3.8.0 using the `python_interpreter.sh script`. + - Python Interpreter Path: `/opt/python380-amd64/python3.8` + - Build Python Command: `sudo sh python_interpreter.sh` + ### Docker * Docker `19.03.8` is installed. diff --git a/user/reference/xenial.md b/user/reference/xenial.md index a8a4e0c2649..a55fc17013c 100644 --- a/user/reference/xenial.md +++ b/user/reference/xenial.md @@ -97,6 +97,44 @@ For preinstalled language interpreters, a standard version manager like `rvm` is * shellcheck 0.7.0 * shfmt 2.6.3 +To use the IBM Advance Toolchain v12 compilers under `ppc64le` architecture in Xenial LXD image, use the following paths in your `.travis.yml`: + +- GCC compiler + - Path: `/opt/at12.0/bin/gcc` + - Command: `/opt/at12.0/bin/gcc hello_world.c -o hello_world` + +- g++ compiler + - Path: `/opt/at12.0/bin/g++` + - Command: `/opt/at12.0/bin/g++ hello_world.cpp -o hello_world` + +- Go compiler + - Path: `/opt/at12.0/bin/gccgo` + - Command: `/opt/at12.0/bin/gccgo hello_world.go -o hello_world` + +- Python + - First, compile Python 3.8.0 using the `python_interpreter.sh script`. + - Python Interpreter Path: `/opt/python380-at12/python3.8` + - Build Python Command: `sudo sh python_interpreter.sh` + +To use the IBM Advance Toolchain v12 compilers under `amd64` architecture in Xenial LXD image, use the following paths in your `.travis.yml`: + +- GCC compiler + - Path: `/opt/at12.0/bin/powerpc64le-linux-gnu-gcc` + - Command: `/opt/at12.0/bin/powerpc64le-linux-gnu-gcc hello_world.c -o hello_world` + +- g++ compiler + - Path: `/opt/at12.0/bin/powerpc64le-linux-gnu-g++` + - Command: `/opt/at12.0/bin/powerpc64le-linux-gnu-g++ hello_world.cpp -o hello_world` + +- Go compiler + - Path: `/opt/at12.0/bin/powerpc64le-linux-gnu-gccgo` + - Command: `/opt/at12.0/bin/powerpc64le-linux-gnu-gccgo hello_world.go -o hello_world` + +- Python + - First, compile Python 3.8.0 using the `python_interpreter.sh script` + - Python Interpreter Path: `/opt/python380-amd64/python3.8` + - Build Python Command: `sudo sh python_interpreter.sh` + ### Docker * Docker 18.06.0-ce is installed diff --git a/user/sonarcloud.md b/user/sonarcloud.md index 0ef1d26fbdb..96bbcdc80f2 100644 --- a/user/sonarcloud.md +++ b/user/sonarcloud.md @@ -67,7 +67,7 @@ script: Please take a look at the [live Maven-based example project](https://github.com/SonarSource/sq-com_example_java-maven-travis) to know more about this use case. -Without POM update, or if you are [Testing Against Multiple JDKs](languages/java/#testing-against-multiple-jdks) (SonarCloud analysis should be executed only once), or need multiple steps Maven commands ; execute [JaCoCo XML report generation](https://www.eclemma.org/jacoco/trunk/doc/report-mojo.html) at end of your main build. Script section would be like: +Without POM update, or if you are [Testing Against Multiple JDKs](/user/languages/java/#testing-against-multiple-jdks) (SonarCloud analysis should be executed only once), or need multiple steps Maven commands ; execute [JaCoCo XML report generation](https://www.eclemma.org/jacoco/trunk/doc/report-mojo.html) at end of your main build. Script section would be like: ```yaml script: From 90a28ed5d778ebf4e3689206e941374fd150fb72 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Mon, 14 Dec 2020 17:49:56 +0000 Subject: [PATCH 22/30] Update master --- user/build-config-yaml.md | 2 +- user/enterprise/tcie-3.x-setting-up-travis-ci-enterprise.md | 2 +- user/job-lifecycle.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/user/build-config-yaml.md b/user/build-config-yaml.md index 103c773870f..03333348030 100644 --- a/user/build-config-yaml.md +++ b/user/build-config-yaml.md @@ -6,7 +6,7 @@ layout: en Travis CI uses YAML as the primary language for build configuration stored in the main `.travis.yml` build config file, as well as other config sources -imported using the [Build Config Imports](/build-config-imports) feature. +imported using the [Build Config Imports](/user/build-config-imports) feature. This page documents a few noteworthy pieces of information about how Travis CI uses YAML. diff --git a/user/enterprise/tcie-3.x-setting-up-travis-ci-enterprise.md b/user/enterprise/tcie-3.x-setting-up-travis-ci-enterprise.md index ea89838f9fc..d77a9028af6 100644 --- a/user/enterprise/tcie-3.x-setting-up-travis-ci-enterprise.md +++ b/user/enterprise/tcie-3.x-setting-up-travis-ci-enterprise.md @@ -55,7 +55,7 @@ or multiple instances managed by Kubernetes, separate from that of the Travis CI Enterprise worker. We recommend **compute optimized** instance running Ubuntu 18.04 LTS or later as the underlying operating system. -> If you are migrating from Travis CI enteprise 2.x, please make sure to read and execute the [datbase migration instructions](/user/enterprise/tcie-3.x-migrating-db-from-2.x-to-3.x./) first. +> If you are migrating from Travis CI enteprise 2.x, please make sure to read and execute the [datbase migration instructions](/user/enterprise/tcie-3.x-migrating-db-from-2.x-to-3.x/) first. 1. *On your infrastructure management platform*, create a Travis CI Platform Security Group. diff --git a/user/job-lifecycle.md b/user/job-lifecycle.md index c3ce1cbf449..fa1913abe38 100644 --- a/user/job-lifecycle.md +++ b/user/job-lifecycle.md @@ -15,7 +15,7 @@ The `.travis.yml` file describes the build process. A *build* in Travis CI is a ## The Job Lifecycle -Each *job* is a sequence of [phases](../for-beginners/#builds-jobs-stages-and-phases). The *main phases* are: +Each *job* is a sequence of [phases](/user/for-beginners/#builds-jobs-stages-and-phases). The *main phases* are: 1. `install` - install any dependencies required 2. `script` - run the build script From d0321bab8fb7992fcfdd7bc50134198d3f5423ba Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Tue, 15 Dec 2020 17:49:59 +0000 Subject: [PATCH 23/30] Update master --- user/travis-ci-for-private.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/travis-ci-for-private.md b/user/travis-ci-for-private.md index ec911970b01..db583ea0615 100644 --- a/user/travis-ci-for-private.md +++ b/user/travis-ci-for-private.md @@ -14,7 +14,7 @@ continuous integration solution for private repositories. Yes, of course! No need to put in your credit card details, the trial starts whenever you trigger your first build on [Travis CI for private repositories](https://travis-ci.com). It includes 100 trial builds for free and 2-concurrent-jobs. -When you're ready to start using Travis CI, head over to the [billing page](https://travis-ci.com/account/subscription) to add your billing details and end your trial. +When you're ready to start using Travis CI, head over to the [billing page](https://travis-ci.com/plans) to add your billing details and end your trial. ## Can I use pull request testing on Travis CI for private repositories? From 29222ff7174c62d0b8ca26c8e4a1fa16979fd4d3 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Wed, 16 Dec 2020 17:50:33 +0000 Subject: [PATCH 24/30] Update master --- user/caching.md | 2 +- user/deepsource.md | 4 ++-- user/sonarcloud.md | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/user/caching.md b/user/caching.md index 1ab1ee5ab9a..a153752d643 100644 --- a/user/caching.md +++ b/user/caching.md @@ -432,7 +432,7 @@ jobs should use. These factors are: 1. OS name (currently, `linux`, `osx`, or `windows`) -2. OS distribution (for Linux, `xenial`, `trusty`, or `precise`) +2. OS distribution (for Linux, `focal`, `bionic`, `xenial`, `trusty`, or `precise`) 3. macOS image name (e.g., `xcode7.2`) 4. Names and values of visible environment variables set in `.travis.yml` or Settings panel 5. Language runtime version (for the language specified in the `language` key) if applicable diff --git a/user/deepsource.md b/user/deepsource.md index fe42e8d8359..f82ad4cf1e0 100644 --- a/user/deepsource.md +++ b/user/deepsource.md @@ -28,14 +28,14 @@ name = "test-coverage" enabled = true ``` -Refer to [DeepSource's analyzer documentation](https://deepsource.io/docs/analyzers/) for instructions specific to the analyzer. +Refer to [DeepSource's analyzer documentation](https://deepsource.io/docs/analyzer/) for instructions specific to the analyzer. ## Install CLI and push artifacts - Install deepsource CLI by executing `curl https://deepsource.io/cli | sh` - Report the artifact by executing `./bin/deepsource report --analyzer --key --value-file ` -Refer to [DeepSource CLI documentation](https://deepsource.io/docs/configuration/cli.html) for detailed instructions. +Refer to [DeepSource CLI documentation](https://deepsource.io/docs/config/cli.html) for detailed instructions. ## Example diff --git a/user/sonarcloud.md b/user/sonarcloud.md index 96bbcdc80f2..c6fb6494ac7 100644 --- a/user/sonarcloud.md +++ b/user/sonarcloud.md @@ -53,8 +53,7 @@ Lots of Java projects build with Maven. To add a SonarCloud inspection to your M addons: sonarcloud: organization: "sonarcloud_organization_key" # the key of the org you chose at step #3 - token: - secure: "*********" # encrypted value of your token + token: "*********" # encrypted value of your token script: # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis - mvn clean verify sonar:sonar -Pcoverage -Dsonar.projectKey=myorg_myrepo From f33bfc5636dc042bbf2960fee6d1f9bf074793ae Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Thu, 24 Dec 2020 17:55:18 +0000 Subject: [PATCH 25/30] Update master --- user/reference/bionic.md | 6 ++++++ user/reference/focal.md | 6 ++++++ user/reference/xenial.md | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/user/reference/bionic.md b/user/reference/bionic.md index a72000e90b5..ca71122744f 100644 --- a/user/reference/bionic.md +++ b/user/reference/bionic.md @@ -184,6 +184,12 @@ is `openjdk11`. | groovy | 2.4.5 | {: style="width: 30%" } +## Perl support + +* Default version on Xenial is `5.26.1` +* Supported versions `5.22`, `5.24`, `5.26`, `5.28`, `5.30` and `5.32` can be installed by using the `perl:`-key. +* `TAP::Harness` v3.38 and `cpanm` (App::cpanminus) version 1.7044 are also pre-installed. + ## PHP support * For dynamic runtime selection, `phpenv` is available. diff --git a/user/reference/focal.md b/user/reference/focal.md index 2355d15b0d5..11d1a0d70eb 100644 --- a/user/reference/focal.md +++ b/user/reference/focal.md @@ -186,6 +186,12 @@ is `openjdk11`. | groovy | `2.4.5` | {: style="width: 30%" } +## Perl support + +* Default version on Focal is `5.30.0` +* Supported versions `5.22`, `5.24`, `5.26`, `5.28`, `5.30` and `5.32` can be installed by using the `perl:`-key. +* `TAP::Harness` v3.42 and `cpanm` (App::cpanminus) version 1.7044 are also pre-installed. + ## PHP support * For dynamic runtime selection, `phpenv` is available. diff --git a/user/reference/xenial.md b/user/reference/xenial.md index a55fc17013c..a915b4fca1f 100644 --- a/user/reference/xenial.md +++ b/user/reference/xenial.md @@ -182,8 +182,10 @@ is `openjdk8`; `openjdk7` and `openjdk8` on ppc64le. {: style="width: 30%" } ## Perl support -* Default version on Xenial is `5.18.4` + +* Default version on Xenial is `5.22.1` * Supported versions `5.22`, `5.24`, `5.26`, `5.28` and `5.30` can be installed by using the `perl:`-key. +* `TAP::Harness` v3.35 and `cpanm` (App::cpanminus) version 1.7044 are also pre-installed. ## PHP support From 13f2c1a4845f0a6a58721075d5c4a32a821dcad4 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Fri, 25 Dec 2020 17:56:08 +0000 Subject: [PATCH 26/30] Update master --- user/environment-variables.md | 1 + 1 file changed, 1 insertion(+) diff --git a/user/environment-variables.md b/user/environment-variables.md index fb73d4f9a17..af44a825f05 100644 --- a/user/environment-variables.md +++ b/user/environment-variables.md @@ -157,6 +157,7 @@ You can find more information on the build config format for [Environment Variab The following default environment variables are available to all builds. - `CI=true` +- `TZ=UTC` - `TRAVIS=true` - `CONTINUOUS_INTEGRATION=true` - `DEBIAN_FRONTEND=noninteractive` From 3675bdb30494dc8b83df11627febe039a355d614 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Tue, 29 Dec 2020 17:57:24 +0000 Subject: [PATCH 27/30] Update master --- _data/snippets.yml | 2 +- images/apps/meercodeio.png | Bin 0 -> 15621 bytes user/apps.md | 8 ++++++++ user/billing-overview.md | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 images/apps/meercodeio.png diff --git a/_data/snippets.yml b/_data/snippets.yml index a41b2558d40..f2eebbef646 100644 --- a/_data/snippets.yml +++ b/_data/snippets.yml @@ -123,7 +123,7 @@ github_oauth_access_rights: | > This application will be able to read and write all public and private repository data. - This is not how Travis CI access yout data, however we can explain it later in the process. + This is not how Travis CI accesses your data, however we can explain it later in the process. The warning is triggerred due to GitHub OAuth App permissions which Travis CI uses, and due to the available granularity of permission scopes (see GitHub [Scopes for OAuth Apps documentation](https://docs.github.com/en/developers/apps/scopes-for-oauth-apps) ). diff --git a/images/apps/meercodeio.png b/images/apps/meercodeio.png new file mode 100644 index 0000000000000000000000000000000000000000..f96bdb6ea7bde889e2e60041fa6f85ec455b0a6a GIT binary patch literal 15621 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 ShxRo9peUy%TP +By Meercode.io + +- [website](https://meercode.io/) ## Tools diff --git a/user/billing-overview.md b/user/billing-overview.md index 8b88a77cda1..bb689a28e55 100644 --- a/user/billing-overview.md +++ b/user/billing-overview.md @@ -27,7 +27,7 @@ A 'Free' Plan, assigned automatically to every new sign up, is a Usage based pla ## Concurrency based plans -Concurrency based plans is much like what Travis CI has been oferring already for a long time: an ability to run a build consisting of X concurrent jobs. +Concurrency based plans are much like what Travis CI has been offering already for a long time: an ability to run a build consisting of X concurrent jobs. In Travis CI builds are executed singularly, without exceeding limitations. Therefore, if executing multiple builds at the same time or executing a build with multiple build jobs, once the concurrency limit is reached, the reminder builds/jobs must wait until there is a queue capacity available for processing. > If a user on the 2 concurrent jobs plan executes a build with 5 build jobs, only the first 2 builds are processed while the remaining 3 of the builds wait in line to be processed. From 216c196d5b3eaeb3e0754760d8bf7f6539e38af1 Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Mon, 4 Jan 2021 17:59:16 +0000 Subject: [PATCH 28/30] Update master --- user/database-setup.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/user/database-setup.md b/user/database-setup.md index 3690ff6330e..035011f901c 100644 --- a/user/database-setup.md +++ b/user/database-setup.md @@ -324,7 +324,9 @@ services: ``` {: data-file=".travis.yml"} -CouchDB binds to 127.0.0.1, uses default configuration and does not require authentication (in CouchDB terms it runs in admin party). +CouchDB binds to 127.0.0.1, uses default configuration on `dist:xenial` and earlier Linux distributions and does not require authentication (in CouchDB terms it runs in admin party). + +However for `bionic`, authentication is required with username `admin` and password `travis` e.g. `curl -X PUT http://admin:travis@localhost:5984/`. Before using CouchDB you need to create the database as part of your build process: From 17aca8fad4c85bb7c03e8f5abd14efae9e449adf Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Wed, 3 Feb 2021 18:18:21 +0000 Subject: [PATCH 29/30] Update master --- user/database-setup.md | 16 ++++++++++++---- user/gui-and-headless-browsers.md | 2 +- user/sonarcloud.md | 11 ++++++----- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/user/database-setup.md b/user/database-setup.md index 035011f901c..7ebceb12fe0 100644 --- a/user/database-setup.md +++ b/user/database-setup.md @@ -160,21 +160,29 @@ addons: Many PostgreSQL versions have been preinstalled in our build environments, and others may be added and activated at build time by using a combination of the -`postgresql` and `apt` addons along with a global env var override for `PGPORT`: +`postgresql` and `apt` addons along with a global env var override for `PGPORT` and for `PGUSER`: ``` yaml addons: - postgresql: "10" + postgresql: "11" apt: packages: - - postgresql-10 - - postgresql-client-10 + - postgresql-11 + - postgresql-client-11 env: global: - PGPORT=5433 + - PGUSER=travis ``` {: data-file=".travis.yml"} +In the Xenial images Postgres 9.4 through 9.6 just need the version specified and use the user +`postgres` by default and the default port of 5432. + +For PostgreSQL 10 you must specify the packages +to install it and the user is `postgres` and the port is 5432. For PostgreSQL 11 and 12 you must + specify the packages, but the user is `travis` and the port is 5433 instead. So you must specify the PGPORT + ### Using PostGIS Install the version of PostGIS that matches your PostgreSQL version, and activate the PostGIS extension using: diff --git a/user/gui-and-headless-browsers.md b/user/gui-and-headless-browsers.md index 64008ff36e7..cfa7c638cb1 100644 --- a/user/gui-and-headless-browsers.md +++ b/user/gui-and-headless-browsers.md @@ -239,7 +239,7 @@ If you need a web server to serve the tests, see the previous section. ### Real World Projects -- [Ember.js](https://github.com/emberjs/ember.js/blob/master/.travis.yml) (starts web server programmatically) +- [Ember.js](https://github.com/emberjs/ember-mocha/blob/master/.travis.yml) (starts web server programmatically) - [Sproutcore](https://github.com/sproutcore/sproutcore/blob/master/.travis.yml) (starts web server with *before_script*) ### Ruby diff --git a/user/sonarcloud.md b/user/sonarcloud.md index c6fb6494ac7..4b6e2faf0f6 100644 --- a/user/sonarcloud.md +++ b/user/sonarcloud.md @@ -18,16 +18,17 @@ The default Travis dist dist: xenial ``` {: data-file=".travis.yml"} -inlcudes Java 11 by default. +includes Java 11 by default. ## Inspecting code with the SonarQube Scanner Before inspecting your code, you need to: -1. [Create a user authentication token](https://sonarcloud.io/account/security) for your account on SonarCloud. -2. [Encrypt this token](/user/encryption-keys/#usage) `travis encrypt abcdef0123456789` or define `SONAR_TOKEN` in your [Repository Settings](/user/environment-variables/#defining-variables-in-repository-settings) -3. [Find which SonarCloud.io organization](https://sonarcloud.io/account/organizations) you want to push your project on and get its key -4. Create a `sonar-project.properties` file for your project (see the [documentation](http://redirect.sonarsource.com/doc/install-configure-scanner.html)). +1. Make sure that your repository is correctly activated on Travis CI. See [Travis CI Tutorial](https://docs.travis-ci.com/user/tutorial/). +2. [Create a user authentication token](https://sonarcloud.io/account/security) for your account on SonarCloud. +3. [Encrypt this token](/user/encryption-keys/#usage) `travis encrypt abcdef0123456789` or define `SONAR_TOKEN` in your [Repository Settings](/user/environment-variables/#defining-variables-in-repository-settings) +4. [Find which SonarCloud.io organization](https://sonarcloud.io/account/organizations) you want to push your project on and get its key +5. Create a `sonar-project.properties` file for your project (see the [documentation](http://redirect.sonarsource.com/doc/install-configure-scanner.html)). Then add the following lines to your `.travis.yml` file to trigger the analysis: From 841f080f1effa13bb2d95d243e2992ef1062279c Mon Sep 17 00:00:00 2001 From: "Travis CI dpl test (via Travis CI)" <> Date: Wed, 10 Feb 2021 18:23:47 +0000 Subject: [PATCH 30/30] Update master --- _data/snippets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_data/snippets.yml b/_data/snippets.yml index f2eebbef646..4c6450aa50c 100644 --- a/_data/snippets.yml +++ b/_data/snippets.yml @@ -64,7 +64,7 @@ concurrent_jobs: | auto_cancellation: | If you are only interested in building the most recent commit on each branch you can use this new feature to automatically cancel older builds in the queue that are not yet running. cron_jobs: | - Travis CI cron jobs work similarly to the cron utilty, they run builds at regular scheduled intervals independently of whether any commits were pushed to the repository. Cron jobs always fetch the most recent commit on a particular branch and build the project at that state. Cron jobs can run `daily`, `weekly` or `monthly`, which in practice means up to an hour after the selected time span, and you cannot set them to run at a specific time. + Travis CI cron jobs work similarly to the cron utility, they run builds at regular scheduled intervals independently of whether any commits were pushed to the repository. Cron jobs always fetch the most recent commit on a particular branch and build the project at that state. Cron jobs can run `daily`, `weekly` or `monthly`, which in practice means up to an hour after the selected time span, and you cannot set them to run at a specific time. environment_variables: | Variables defined in repository settings are the same for all builds, and when you restart an old build, it uses the latest values. These variables are not automatically available to forks.