Skip to content

Commit fea9182

Browse files
committed
Merge branch 'release-candidate' into release
2 parents 5ba16d3 + 94df606 commit fea9182

Some content is hidden

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

59 files changed

+6372
-3424
lines changed

.github/workflows/release-build-tag-release.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@ jobs:
99
create-new-release-version:
1010
runs-on: ubuntu-latest
1111

12-
strategy:
13-
matrix:
14-
node-version: [18.x]
15-
1612
steps:
1713
- name: Checkout code
18-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1915
with:
2016
persist-credentials: false
2117

.github/workflows/release-create-release-candidate-branch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout code
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
with:
1616
token: ${{ secrets.ACTION_TOKEN }}
1717
ref: release
@@ -40,7 +40,7 @@ jobs:
4040
input-file: 'CHANGELOG.md'
4141

4242
- name: Create Pull Request
43-
uses: peter-evans/create-pull-request@v5
43+
uses: peter-evans/create-pull-request@v6
4444
with:
4545
token: ${{ secrets.ACTION_TOKEN }}
4646
title: Release Candidate - ${{ steps.changelog.outputs.tag }}${{ github.ref_name != 'develop' && ' (Hotfix)' || ''}}

.github/workflows/test-linting.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@ jobs:
66
lint:
77
runs-on: ubuntu-latest
88

9-
strategy:
10-
matrix:
11-
node-version: [18.x]
12-
139
steps:
14-
- uses: actions/checkout@v3
15-
- name: Use Node.js ${{ matrix.node-version }}
16-
uses: actions/setup-node@v3
10+
- uses: actions/checkout@v4
11+
- name: Use Node.js
12+
uses: actions/setup-node@v4
1713
with:
18-
node-version: ${{ matrix.node-version }}
14+
node-version: '20.x'
1915
- name: yarn install, lint
2016
run: |
2117
yarn install

.github/workflows/test-static-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
3535
# If this step fails, then you should remove it and run the build manually (see below)
3636
- name: Autobuild
37-
uses: github/codeql-action/autobuild@v2
37+
uses: github/codeql-action/autobuild@v3
3838

3939
- name: Perform CodeQL Analysis
40-
uses: github/codeql-action/analyze@v2
40+
uses: github/codeql-action/analyze@v3

.github/workflows/test-unit-snapshot.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,19 @@ name: Test - Unit and Snapshot
22

33
on:
44
push:
5-
branches: [ 'develop', 'release' ]
5+
branches: ['develop', 'release']
66
pull_request:
77

88
jobs:
99
test:
1010
runs-on: ubuntu-latest
1111

12-
strategy:
13-
matrix:
14-
node-version: [18.x]
15-
1612
steps:
17-
- uses: actions/checkout@v3
18-
- name: Use Node.js ${{ matrix.node-version }}
19-
uses: actions/setup-node@v3
13+
- uses: actions/checkout@v4
14+
- name: Use Node.js
15+
uses: actions/setup-node@v4
2016
with:
21-
node-version: ${{ matrix.node-version }}
17+
node-version: '20.x'
2218
- name: yarn install and test
2319
run: |
2420
yarn

.github/workflows/web-test-e2e.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Web - Test - End to End
33
on:
44
pull_request:
55
push:
6-
branches: [ 'develop', 'release' ]
6+
branches: ['develop', 'release']
77
schedule:
88
- cron: '30 3 * * 1-5'
99
workflow_dispatch:
@@ -19,15 +19,14 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
node-version: [18.x]
2322
config: [desktop, mobile]
2423

2524
steps:
26-
- uses: actions/checkout@v3
27-
- name: Use Node.js ${{ matrix.node-version }}
28-
uses: actions/setup-node@v3
25+
- uses: actions/checkout@v4
26+
- name: Use Node.js
27+
uses: actions/setup-node@v4
2928
with:
30-
node-version: ${{ matrix.node-version }}
29+
node-version: '20.x'
3130
- name: Install dependencies
3231
run: |
3332
yarn
@@ -41,7 +40,7 @@ jobs:
4140
WORKER_COUNT: 2
4241
- name: Uploading artifact
4342
if: always()
44-
uses: actions/upload-artifact@v3
43+
uses: actions/upload-artifact@v4
4544
with:
4645
name: allure-report-${{ matrix.config }}
4746
path: ./platforms/web/test-e2e/output/${{ matrix.config }}

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## [6.4.0](https://github.com/jwplayer/ott-web-app/compare/v6.3.0...v6.4.0) (2024-07-04)
2+
3+
4+
### Features
5+
6+
* add log service ([7717a2a](https://github.com/jwplayer/ott-web-app/commit/7717a2a1afed6e379c0fcabb52c1c826f6b47ba1))
7+
18
## [6.3.0](https://github.com/jwplayer/ott-web-app/compare/v6.2.0...v6.3.0) (2024-06-24)
29

310

configs/eslint-config-jwp/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"test": "exit 0"
88
},
99
"devDependencies": {
10-
"@typescript-eslint/eslint-plugin": "^7.1.1",
11-
"@typescript-eslint/parser": "^7.1.1",
12-
"confusing-browser-globals": "^1.0.10",
13-
"eslint-plugin-import": "^2.23.4",
14-
"eslint-plugin-react": "^7.24.0",
15-
"eslint-plugin-react-hooks": "^4.2.0"
10+
"@typescript-eslint/eslint-plugin": "^7.13.1",
11+
"@typescript-eslint/parser": "^7.13.1",
12+
"confusing-browser-globals": "^1.0.11",
13+
"eslint-plugin-import": "^2.29.1",
14+
"eslint-plugin-react": "^7.34.2",
15+
"eslint-plugin-react-hooks": "^4.6.2"
1616
}
1717
}

configs/postcss-config-jwp/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"test": "exit 0"
99
},
1010
"devDependencies": {
11-
"postcss": "^8.4.31",
12-
"postcss-import": "^14.0.2",
13-
"postcss-scss": "^4.0.4",
11+
"postcss": "^8.4.38",
12+
"postcss-import": "^14.1.0",
13+
"postcss-scss": "^4.0.9",
1414
"stylelint": "^15.11.0"
1515
},
1616
"peerDependencies": {

configs/stylelint-config-jwp/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"devDependencies": {
1111
"stylelint": "^15.11.0",
1212
"stylelint-config-recommended-scss": "^13.1.0",
13-
"stylelint-declaration-strict-value": "^1.9.2",
14-
"stylelint-order": "^6.0.3",
15-
"stylelint-scss": "^5.3.1"
13+
"stylelint-declaration-strict-value": "^1.10.4",
14+
"stylelint-order": "^6.0.4",
15+
"stylelint-scss": "^5.3.2"
1616
}
1717
}

0 commit comments

Comments
 (0)