Skip to content

Commit 0c02a47

Browse files
authored
Merge pull request #183 from tidev/githubAction
fix(all): github action
2 parents dca2d91 + 3df6592 commit 0c02a47

File tree

5 files changed

+29
-22
lines changed

5 files changed

+29
-22
lines changed

.github/workflows/android.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: Android Build
2-
on:
2+
on:
33
push:
44
paths-ignore:
55
- 'ios/**'
@@ -17,15 +17,15 @@ jobs:
1717
env:
1818
CCACHE_DIR: ${{ github.workspace }}/.ccache
1919
USE_CCACHE: 1
20-
SDK_VERSION: 9.3.2.GA
20+
SDK_VERSION: 11.0.0.GA
2121
MODULE_ID: ti.socketio
2222
steps:
2323
- uses: actions/checkout@v2
2424

25-
- name: Use Node.js 12.x
26-
uses: actions/setup-node@v1
25+
- name: Use Node.js 14.x
26+
uses: actions/setup-node@v2
2727
with:
28-
node-version: '12.x'
28+
node-version: '14.x'
2929

3030
- name: Cache Node.js modules
3131
id: node-cache
@@ -37,6 +37,12 @@ jobs:
3737
${{ runner.OS }}-node-modules-
3838
${{ runner.OS }}-
3939
40+
- name: Setup Java
41+
uses: actions/setup-java@v2
42+
with:
43+
distribution: 'adopt'
44+
java-version: 11
45+
4046
- run: npm ci
4147
name: Install dependencies
4248
if: steps.node-cache.outputs.cache-hit != 'true'

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v2
1616

17-
- name: Use Node.js 12.x
18-
uses: actions/setup-node@v1
17+
- name: Use Node.js 14.x
18+
uses: actions/setup-node@v2
1919
with:
20-
node-version: '12.x'
20+
node-version: '14.x'
2121

2222
- run: npm ci
2323
name: Install dependencies

.github/workflows/ios.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: iOS Build
2-
on:
2+
on:
33
push:
44
paths-ignore:
55
- 'android/**'
@@ -9,21 +9,21 @@ on:
99
- 'android/**'
1010
- 'apidoc/**'
1111
workflow_dispatch:
12-
12+
1313
jobs:
1414
ios:
1515
runs-on: macos-latest
1616
name: iOS
1717
env:
18-
SDK_VERSION: 9.3.2.GA
18+
SDK_VERSION: 11.0.0.GA
1919
MODULE_ID: ti.socketio
2020
steps:
2121
- uses: actions/checkout@v2
2222

23-
- name: Use Node.js 12.x
24-
uses: actions/setup-node@v1
23+
- name: Use Node.js 14.x
24+
uses: actions/setup-node@v2
2525
with:
26-
node-version: '12.x'
26+
node-version: '14.x'
2727

2828
- name: Cache Node.js modules
2929
id: node-cache

.github/workflows/js.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: JavaScript Lint
2-
on:
2+
on:
33
push:
44
paths:
55
- '**.js'
@@ -11,18 +11,18 @@ on:
1111
- '**.json'
1212
- '**.eslint*'
1313
workflow_dispatch:
14-
14+
1515
jobs:
1616
js:
1717
runs-on: ubuntu-latest
1818
name: JavaScript
1919
steps:
2020
- uses: actions/checkout@v2
2121

22-
- name: Use Node.js 12.x
23-
uses: actions/setup-node@v1
22+
- name: Use Node.js 14.x
23+
uses: actions/setup-node@v2
2424
with:
25-
node-version: '12.x'
25+
node-version: '14.x'
2626

2727
- name: Cache Node.js modules
2828
id: node-cache

test/unit/karma.unit.config.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module.exports = config => {
1313
require('./support/socket.io-server')
1414
],
1515
titanium: {
16-
sdkVersion: config.sdkVersion || '9.3.2.GA'
16+
sdkVersion: config.sdkVersion || '11.0.0.GA'
1717
},
1818
customLaunchers: {
1919
android: {
@@ -32,13 +32,14 @@ module.exports = config => {
3232
browsers: [ 'android', 'ios' ],
3333
client: {
3434
jasmine: {
35-
random: false
35+
random: false,
36+
timeoutInterval: 60000
3637
}
3738
},
3839
singleRun: true,
3940
retryLimit: 0,
4041
concurrency: 1,
41-
captureTimeout: 300000,
42+
captureTimeout: 1000000,
4243
logLevel: config.LOG_DEBUG
4344
});
4445
};

0 commit comments

Comments
 (0)