Skip to content

Commit 518eaac

Browse files
Merge branch 'master' into patch-1
2 parents 206454f + 9379177 commit 518eaac

File tree

7 files changed

+124
-37
lines changed

7 files changed

+124
-37
lines changed

_data/snippets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ github_oauth_access_rights: |
152152
git_repository_settings_forks_general: |
153153
> Repository security settings for forked repositories on Git are available starting March 1st, 2022.
154154
155-
For Git repositories, you may manage per repository how the [environment variables](/user/environment-variables/) and the custom SSH keys](/user/private-dependencies/#user-key) will be handled in Travis CI when a build triggered as an effect of filing a Pull Request from a forked repository. Two settings are available specifically for this purpose, allowing you to customize your security vs. collaboration setup.
155+
For Git repositories, you may manage per repository how the [environment variables](/user/environment-variables/) and the [custom SSH keys](/user/private-dependencies/#user-key) will be handled in Travis CI when a build triggered as an effect of filing a Pull Request from a forked repository. Two settings are available specifically for this purpose, allowing you to customize your security vs. collaboration setup.
156156
157157
**base repository** - a Git repository, which is forked by someone else
158158
**fork** or **forked repository** - any Git repository forked from the **base repository**

_data/xcodes.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,37 @@
11
osx_images:
2+
- image: xcode13.4
3+
xcode: "13.4"
4+
osx_version: "12.4"
5+
xcode_full_version: "13.4.1"
6+
xcode_build_version: "13F100"
7+
image_publish_date: 2021-06-08
8+
sdks:
9+
- iphoneos15.5
10+
- iphonesimulator15.5
11+
- macosx12.3
12+
- appletvos15.4
13+
- appletvsimulator15.4
14+
- watchos8.5
15+
- watchsimulator8.5
16+
simulators:
17+
- iOS 14.4
18+
- iOS 14.5
19+
- iOS 15.0
20+
- iOS 15.2
21+
- iOS 15.4
22+
- iOS 15.5
23+
- tvOS 14.3
24+
- tvOS 14.4
25+
- tvOS 14.5
26+
- tvOS 15.0
27+
- tvOS 15.2
28+
- tvOS 15.4
29+
- watchOS 7.2
30+
- watchOS 7.4
31+
- watchOS 8.0
32+
- watchOS 8.3
33+
- watchOS 8.5
34+
jdk: "18.0.1.1+0"
235
- image: xcode13.3
336
xcode: "13.3"
437
osx_version: "12.3"

user/enterprise/tcie-3.x-migrating-db-from-2.x-to-3.x.md

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ This document describes steps necessary for database migration from existing Tra
1111
The TCIE 3.x runs over Postgresql v11 and features a bit different database schema, synchronized with Travis CI Hosted solution. Since TCIE 3.x is deployed as Kubernetes cluster, PostgreSQL is now one of the pods (TCIE 2.x had every dependency embedded in one large Docker image).
1212

1313
The main schema differences are:
14-
* databases for *logs* and *main* are now separated
15-
* the *_configs* schema in new *main* database is a bit different and thus this part will be not migrated during the following process; that means for builds done before the migration the users won't have the `.travis.yml` contents relevant to these builds available in the web User Interface
14+
* In TCIE 3 databases for *logs* and *main* are now separated
15+
* the *_configs* schema in new TCIE 3 *main* database is a bit different from the one in TCIE 2.2 and thus this part will be not migrated during the following process; that means for builds done before the migration the users won't have the `.travis.yml` contents relevant to these builds available in the web User Interface
1616

1717
## Preparing to the Migration
1818

@@ -70,11 +70,25 @@ As a result, you should have both database files available for further processin
7070

7171
### Alter the Database Dumps
7272

73-
Perform replacement of DB owner identifiers in the database dumps:
73+
74+
Assuming you have used Travis CI Enterprsie 2.2 internal datbase (one delivered with the 2.2 release in master image) please perform replacement of DB owner identifiers in the database dumps:
75+
7476
```bash
7577
sed -i '' 's/Owner: travis/Owner: postgres/g' TCI_E_2_0_db_schema_dump_main_tables_platform_docker_20200324.sql
7678
sed -i '' 's/OWNER TO travis/OWNER TO postgres/g' TCI_E_2_0_db_schema_dump_main_tables_platform_docker_20200324.sql
7779
```
80+
81+
**PLEASE NOTE**:
82+
1. Please reconfirm existing database owner name directly via PSQL query or command line tool. If required, unify/change it to a single user using psql tooling/queries before any further operation is executed.
83+
1. If you use external database (not from the Travis CI Enterprise 2.2 release) and wish to continue so: you do not have to perform above step. Just use the database owner credentials from Travis CI Enterprise 2.2 in Travis Ci Enterprsie 3.x configuration.
84+
2. If you use external database (not from the Travis CI Enterprise 2.2 release) and wish to cease to do so and use database delivered as a pod in Travis CI Enterprsie 3.3, in above bash commands change following fragments
85+
86+
`Owner: travis` to `Owner: {your external tcie 2.2 database owner}`
87+
88+
`OWNER TO travis` to `OWNER TO {your external tcie 2.2 database owner}`
89+
90+
91+
7892
### Make the Altered Dumps Available
7993

8094
Make your dump files available under any `http` address visible for your target Enterprise 3.0 cluster. This serves the purpose of TCIE 3.x installer to be able to download them and migrate the data automatically.

user/images/P4_SVN_TCI_drawing.png

70 KB
Loading

user/languages/python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ a recent development version of [CPython](https://github.com/python/cpython) bui
124124
From Python 3.5 and later, Python In Development versions are available.
125125

126126
You can specify these in your builds with `3.5-dev`, `3.6-dev`,
127-
`3.7-dev`, `3.8-dev` or `3.9-dev`.
127+
`3.7-dev`, `3.8-dev`, `3.9-dev`, `3.10-dev` or `3.11-dev`
128128

129129
## Default Build Script
130130

user/travis-ci-vcs-proxy-get-started.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,18 @@ For more information read the [Setting up Travis CI VCS Proxy](/user/travis-ci-v
2828
#### Steps to geting started
2929

3030
1. Open the received link to Travis CI and select the *Sign up with TCI Proxy* option.
31+
When you do it for the first time, a Travis CI VCS Proxy page will pop-up with an `Authorize` button present. Pressing the button will tell Travis CI VCS Proxy that Travis CI is authorized to obtain organizations, repositories, commit notifications and user emails (for build status notifications, shall you enable these) from Travis CI VCS Proxy. After first authorization it will occur automatically if you log into Travis CI Beta application in the same browser (and site data is not removed).
3132

32-
2. Accept the Travis CI´s Authorization email.
33+
2. Accept the Travis CI´s Authorization email.
34+
> *Please note:* The Beta Travis CI application with support for Travis CI VCS Proxy and regular application are both working in the same Production environment (so once the beta is closed, you can preserve all set up if you wish to). Thus Travis CI Authorization email link may lead you to the main *app.travis-ci.com*. In such case please return to the Travis CI beta application url. You can find it in the Travis CI VCS Proxy welcome e-mail.
3335
34-
3. On the top right of the Travis Dashboard, click on your profile picture and select the *Settings* option. Next, click on the ‘Sync account’ button on the left menu and toggle the repositories you want to use with Travis CI.
36+
3. On the top right of the Travis Dashboard, click on your profile picture and select the *Settings* option. Next, click on the ‘Sync account’ button on the left menu and toggle the repositories you want to use with Travis CI.
37+
> *Please note:* If the synchronization operation doesn't refresh your Travis CI screen automatically within 1 minute, please refresh your browser window manually (Ctrl/Cmd + F5).
3538
36-
4. Add a `.travis.yml` file to your repository to tell Travis CI what to do.
39+
4. Please select a Trial Plan or wait for us to assign special Beta Plan to your account and/or organization(s). In Travis CI each individual User account and each Organization entity must have a separate plans assigned.
40+
> *Please note:* If assigning a plan doesn't remove automatically the insufficient user license/lack of credits error message in your Travis CI Beta application screen, please refresh your browser window manually (Ctrl/Cmd + F5).
41+
42+
5. Add a `.travis.yml` file to your repository to tell Travis CI what to do.
3743

3844
The following example specifies a Ruby project built with Ruby 2.2 and the latest versions of JRuby.
3945

@@ -47,7 +53,7 @@ The following example specifies a Ruby project built with Ruby 2.2 and the lates
4753
4854
The defaults for Ruby projects are a `bundle install` to [install dependencies](/user/job-lifecycle/#customizing-the-installation-phase), and `rake` to build the project.
4955

50-
5. Add the `.travis.yml` file to repository, commit to the repository to trigger a Travis CI build:
56+
6. Add the `.travis.yml` file to repository, commit to the repository to trigger a Travis CI build:
5157

5258
> Travis only runs builds on the commits you push *after* you've added a `.travis.yml` file.
5359

0 commit comments

Comments
 (0)