Skip to content

Commit 049d208

Browse files
maxwellmooney13maxwellmooney13
committed
[STREAM-456] - merge conflict resolution
2 parents 0f00bb1 + bbdcc48 commit 049d208

83 files changed

Lines changed: 10314 additions & 25608 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/cached-deps/action.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: 'Get and Cache Dependencies'
2+
description: 'Get dependencies via npm and cache them.'
3+
inputs:
4+
caching:
5+
description: 'Decide to cache deps or not.'
6+
required: false
7+
default: 'true'
8+
runs:
9+
using: 'composite'
10+
steps:
11+
- name: Cache dependencies
12+
if: inputs.caching == 'true'
13+
id: cache
14+
uses: actions/cache@v3
15+
with:
16+
path: node_modules
17+
key: deps-node-modules-${{ hashFiles('**/package-lock.json') }}
18+
- name: Install dependencies
19+
if: steps.cache.outputs.cache-hit != 'true' || inputs.caching != 'true'
20+
run: npm ci
21+
shell: bash

‎.github/pull_request_template.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
### MERGE CHECKLIST
2+
3+
- [ ] Tests have been updated, added, or removed and the testing matrix has passed.
4+
- [ ] Documentation has been updated or added.
5+
- [ ] Changelog has been updated with ticket or issue number, link to the ticket, and a description of the changes.
6+
- [ ] Branch has been built in the BitBucket wrapper repository.
7+
- [ ] Pull request title is formatted as `[STREAM-<ticket number>] - <description of changes>` or `[<issue number>] - <description of changes>`.
8+
- [ ] Release pull requests include someone from the PureScale team for approval.
9+
- [ ] Build release branch in wrapper repository and make sure it is tagged with `next` on npm.
10+

‎.github/workflows/build.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Build
2+
on: push
3+
jobs:
4+
lint:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- name: Checkout
8+
uses: actions/checkout@v4
9+
- name: Install and Cache Dependencies
10+
uses: ./.github/actions/cached-deps
11+
with:
12+
caching: 'false'
13+
- name: Lint code
14+
run: npm run lint
15+
security-audit:
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
- name: Install and Cache Dependencies
21+
uses: ./.github/actions/cached-deps
22+
- name: Run security audit
23+
id: security-audit
24+
run: npm audit --audit-level=critical --omit=dev
25+
test:
26+
runs-on: ubuntu-latest
27+
steps:
28+
- name: Checkout
29+
uses: actions/checkout@v4
30+
- name: Install and Cache Dependencies
31+
uses: ./.github/actions/cached-deps
32+
with:
33+
caching: 'true'
34+
- name: Run tests
35+
id: run-tests
36+
run: npm run test
37+
- name: Upload test report
38+
if: failure() && steps.run-tests.outcome == 'failure'
39+
uses: actions/upload-artifact@v4
40+
with:
41+
name: test-report
42+
path: test.json
43+
build:
44+
needs: test
45+
runs-on: ubuntu-latest
46+
steps:
47+
- name: Checkout
48+
uses: actions/checkout@v4
49+
- name: Install and Cache Dependencies
50+
uses: ./.github/actions/cached-deps
51+
with:
52+
caching: 'true'
53+
- name: Build
54+
run: npm run build
55+
- name: Upload build artifacts
56+
uses: actions/upload-artifact@v4
57+
with:
58+
name: build-artifacts
59+
path: dist

‎.github/workflows/matrix.yml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: Test Matrix
2+
on:
3+
push:
4+
branches:
5+
- develop
6+
- master
7+
pull_request:
8+
branches:
9+
- develop
10+
- master
11+
jobs:
12+
build:
13+
strategy:
14+
fail-fast: false
15+
matrix:
16+
node-version: [18, 20, 22]
17+
operating-system:
18+
- ubuntu-latest
19+
- windows-latest
20+
# - macos-latest -> Rollup is not supported on ARM64 - https://github.com/npm/cli/issues/4828
21+
runs-on: ${{ matrix.operating-system }}
22+
steps:
23+
- name: Checkout
24+
uses: actions/checkout@v4
25+
- name: Setup Node
26+
uses: actions/setup-node@v4
27+
with:
28+
node-version: ${{ matrix.node-version }}
29+
- name: Remove old install # Rollup bug workaround -> https://github.com/npm/cli/issues/4828
30+
shell: pwsh
31+
run: |
32+
if (Test-Path "node_modules") { Remove-Item -Recurse -Force "node_modules" }
33+
if (Test-Path "package-lock.json") { Remove-Item -Force "package-lock.json" }
34+
- name: Restore node_modules cache
35+
uses: actions/cache@v3
36+
with:
37+
path: node_modules
38+
key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }}
39+
restore-keys: |
40+
${{ runner.os }}-node-${{ matrix.node-version }}-
41+
- name: Install dependencies
42+
run: npm install
43+
- name: Cache node_modules (post-install)
44+
uses: actions/cache@v3
45+
with:
46+
path: node_modules
47+
key: ${{ runner.os }}-node-${{ matrix.node-version }}-${{ hashFiles('package-lock.json') }}
48+
- name: Build
49+
run: npm run build
50+
test:
51+
strategy:
52+
fail-fast: false
53+
matrix:
54+
node-version: [18, 20, 22]
55+
operating-system: [ubuntu-latest, windows-latest, macos-latest]
56+
runs-on: ${{ matrix.operating-system }}
57+
steps:
58+
- name: Checkout
59+
uses: actions/checkout@v4
60+
- name: Setup Node
61+
uses: actions/setup-node@v4
62+
with:
63+
node-version: ${{ matrix.node-version }}
64+
- name: Install and Cache Dependencies
65+
uses: ./.github/actions/cached-deps
66+
- name: Test
67+
run: npm run test
68+
69+
check:
70+
needs: [build, test]
71+
runs-on: ubuntu-latest
72+
if: always()
73+
steps:
74+
- name: Check build matrix status
75+
if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
76+
run: exit 1
77+
- name: All jobs succeeded
78+
if: contains(needs.*.result, 'failure') != true && contains(needs.*.result, 'cancelled') != true
79+
run: echo "All jobs completed successfully!"

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,16 @@ test/test-pages/*/index.html
1818
## vscode specific files
1919
/.vscode
2020

21-
## webstorm specific files
21+
## jetbrains specific files
2222
/.idea
23+
genesys-cloud-webrtc-sdk.iml
2324

2425
# tap specific files
2526
/.nyc_output
2627
/coverage
2728

2829
/.npmrc
30+
31+
/test-results
32+
33+
.DS_Store

‎.nvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v22.17.1

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
* @zservies @maxwellmooney13 @hjon
1+
* @zservies @maxwellmooney13 @hjon @patrickfeeney03

0 commit comments

Comments
 (0)
⚡