Skip to content

Commit

Permalink
chore: merge pull request #394 from jwplayer/release-candidate
Browse files Browse the repository at this point in the history
v4.30.0 Release Candidate
  • Loading branch information
dbudzins authored Nov 8, 2023
2 parents 81ed83e + 131b854 commit 79f242f
Show file tree
Hide file tree
Showing 51 changed files with 1,064 additions and 800 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/release-create-release-candidate-branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ jobs:
git fetch origin develop
git merge origin/develop
yarn && yarn i18next
git add public/locales/*
git commit -m 'chore: parse latest translation tags'
env:
GITHUB_TOKEN: ${{ secrets.ACTION_TOKEN }}

Expand All @@ -38,7 +36,8 @@ jobs:
skip-tag: true
git-push: false
skip-ci: false
skip-version-file: true
preset: conventionalcommits
input-file: "CHANGELOG.md"

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
Expand Down
30 changes: 20 additions & 10 deletions .github/workflows/release-tag-and-build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Release - Tag and Build Artifacts

on:
workflow_dispatch:
push:
branches: ['release']

Expand All @@ -13,13 +14,6 @@ jobs:
with:
persist-credentials: false

- name: Generate changelog
id: changelog
uses: TriPSs/conventional-changelog-action@v3
with:
github-token: ${{ secrets.ACTION_TOKEN }}
release-count: '0'

- name: Install dependencies
run: yarn

Expand All @@ -32,18 +26,34 @@ jobs:
tar czf ott-web-app-build-${RELEASE_VERSION}.tar.gz public
zip -r ott-web-app-build-${RELEASE_VERSION}.zip public
- name: Get current package version
id: package-version
run: |
version=$( jq -r .version package.json)
echo "current-version=${version}" >> "$GITHUB_OUTPUT"
- name: Parse Changelog Entry
id: changelog-reader
uses: coditory/changelog-parser@v1
with:
version: ${{ steps.package-version.outputs.current-version }}
- name: ECHO
run: |
echo "${{steps.package-version.outputs.current-version}}"
echo "${{steps.changelog-reader.outputs.description}}"
- name: Append Release Notes
run: |
cat <<EOT >> .github/RELEASE_BODY_TEMPLATE.md
${{ steps.changelog.outputs.clean_changelog }}
${{ steps.changelog-reader.outputs.description }}
EOT
echo "Appended release notes"
- name: Release
uses: ncipollo/release-action@v1
if: ${{ steps.changelog.outputs.tag }}
if: ${{ steps.package-version.outputs.current-version }}
with:
artifacts: 'build/ott-web-app-build-*.tar.gz, build/ott-web-app-build-*.zip'
tag: ${{ steps.changelog.outputs.tag }}
tag: v${{ steps.package-version.outputs.current-version }}
bodyFile: '.github/RELEASE_BODY_TEMPLATE.md'
token: ${{ secrets.github_token }}
763 changes: 316 additions & 447 deletions CHANGELOG.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jw-ott-webapp",
"version": "4.29.0",
"version": "4.30.0",
"main": "index.js",
"repository": "https://github.com/jwplayer/ott-web-app.git",
"author": "JW Player",
Expand All @@ -18,7 +18,7 @@
"test-coverage": "TZ=UTC LC_ALL=en_US.UTF-8 vitest run --coverage",
"test-commit": "TZ=UTC LC_ALL=en_US.UTF-8 vitest run --changed HEAD~1 --coverage",
"test-update": "TZ=UTC LC_ALL=en_US.UTF-8 vitest run --update",
"i18next": "i18next src/{components,containers,pages,services,stores}/**/{**/,/}*.{ts,tsx} && node ./scripts/i18next/generate.js",
"i18next": "i18next src/{components,containers,pages,services,stores,hooks}/**/{**/,/}*.{ts,tsx} && node ./scripts/i18next/generate.js",
"i18next-diff": "npx ts-node ./scripts/i18next/diff-translations",
"i18next-update": "npx ts-node ./scripts/i18next/update-translations && yarn i18next",
"format": "run-s -c format:*",
Expand All @@ -43,7 +43,7 @@
"dependencies": {
"@adyen/adyen-web": "^5.42.1",
"@codeceptjs/allure-legacy": "^1.0.2",
"@inplayer-org/inplayer.js": "^3.13.15",
"@inplayer-org/inplayer.js": "^3.13.19",
"classnames": "^2.3.1",
"date-fns": "^2.28.0",
"dompurify": "^2.3.8",
Expand Down
15 changes: 15 additions & 0 deletions public/images/avatars/Alien.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions public/images/avatars/Bear.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions public/images/avatars/Brainy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions public/images/avatars/Cooool.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/images/avatars/Dummy.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions public/images/avatars/Frog.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions public/images/avatars/Goofball.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions public/images/avatars/Marilyn.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions public/images/avatars/Smiley.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 79f242f

Please sign in to comment.