Skip to content

Commit

Permalink
fix(ci): make all SSR-related jobs as optional (#5850)
Browse files Browse the repository at this point in the history
* fix(ci): make all SSR-related jobs as optional

* fix(docs): update documentation about 6.0.0 and angular versions
  • Loading branch information
daniloff200 authored Jul 7, 2020
1 parent 4cc35c5 commit 655215d
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ jobs:
- env: NGV=next
- name: sauce-tests
- name: "Cypress Applitools Snapshot tests"
- name: "Cypress suit run on SSR 1thread"
- name: "Cypress suit run on SSR 2thread"
- name: "Cypress suit run on SSR 3thread"
include:
# precache npm and apt dependencies
# - stage: precache
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ Here is the versions compatibility list:

| ngx-bootstrap | Angular | Bootstrap CSS |
| ------------- | ------------- | -------------- |
| 5.6.x | 7.x.x - 9.x.x | 3.x.x or 4.x.x |
| 6.0.0 | 9.x.x - 10.x.x | 3.x.x or 4.x.x |
| 5.6.x | 7.x.x - 9.1.0 | 3.x.x or 4.x.x |
| 5.0.0 - 5.6.0 | 7.x.x - 8.x.x | 3.x.x or 4.x.x |
| 4.x.x | 6.x.x - 7.x.x | 3.x.x or 4.x.x |
| 3.x.x | 6.x.x - 7.x.x | 3.x.x or 4.x.x |
Expand Down
13 changes: 9 additions & 4 deletions demo/src/app/common/documentation/documentation.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ <h2 id="usage--demo">Usage & Demo </h2>

<p>Main source of API documentation and usage examples available here:
<a href="https://valor-software.com/ngx-bootstrap/">https://valor-software.com/ngx-bootstrap/</a></p>
<p>Additionally you can find demos and docs deployed from latest code with <a href="https://ngx-bootstrap.surge.sh/">angular v4</a> and <a
href="https://ngx-bootstrap-latest.surge.sh/">angular v5</a></p>
<p>Server side rendered version of this documentation available <a href="https://ngx-universal.herokuapp.com/">here</a></p>
<p>Additionally you can find demos and docs deployed from latest code with <a href="https://ngx-bootstrap.surge.sh/">angular 9</a> and <a
href="https://ngx-bootstrap-latest.surge.sh/">angular 10</a></p>
<!-- <p>Server side rendered version of this documentation available <a href="https://ngx-universal.herokuapp.com/">here</a></p>-->

<h2 id="api">API</h2>

Expand All @@ -167,9 +167,14 @@ <h2 id="compatibility">Compatibility</h2>
</tr>
</thead>
<tbody>
<tr>
<th>6.0.0</th>
<th>9.x.x - 10.x.x</th>
<th>3.x.x or 4.x.x</th>
</tr>
<tr>
<th>5.6.x</th>
<th>7.x.x - 9.x.x</th>
<th>7.x.x - 9.1.0</th>
<th>3.x.x or 4.x.x</th>
</tr>
<tr>
Expand Down

0 comments on commit 655215d

Please sign in to comment.