Skip to content

Commit

Permalink
Merge branch 'main' into dont-show-track-selection
Browse files Browse the repository at this point in the history
  • Loading branch information
Arnei committed Jan 17, 2025
2 parents 48c70df + f4c7f68 commit fc9ea4a
Show file tree
Hide file tree
Showing 82 changed files with 10,709 additions and 10,917 deletions.
2 changes: 1 addition & 1 deletion .github/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export PUBLIC_URL=/editor-ui
export VITE_APP_SETTINGS_PATH="/ui/config/editor/editor-settings.toml"
npm run build

FILENAME="oc-editor-$(date --utc +%F).tar.gz"
FILENAME="oc-editor-$(date -u +%F).tar.gz"
cd build
TMP="$(mktemp)"
mv editor-settings.toml "$TMP"
Expand Down
24 changes: 16 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: monthly
time: "04:00"
open-pull-requests-limit: 15
labels:
- type:dependencies

# GHA
- package-ecosystem: github-actions
directory: /
schedule:
interval: monthly

# Javascript
- package-ecosystem: npm
directory: /
schedule:
interval: monthly
time: "04:00"
open-pull-requests-limit: 15
labels:
- type:dependencies
6 changes: 4 additions & 2 deletions .github/workflows/check-icla.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ on:
jobs:
main:
if: github.event.pull_request.user.login != 'dependabot[bot]'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/setup-python@v5

- name: Install Python module
run: pip install apereocla
run: pip install --break-system-packages apereocla

- name: Check Apereo ICLA for GitHub user
run: apereocla -g "${{ github.event.pull_request.user.login }}"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: use node.js 18.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: download dependencies
run: npm ci
Expand All @@ -25,7 +25,7 @@ jobs:
run: ./.github/build-release.sh

- name: create new release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v2
with:
files: oc-editor-*.tar.gz
draft: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Update translations
name: Crowdin » Download translations

on:
schedule:
Expand All @@ -10,7 +10,7 @@ jobs:
if: github.repository_owner == 'opencast'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: prepare git
run: |
Expand All @@ -28,14 +28,14 @@ jobs:
run: |
crowdin download --config .crowdin.yaml -b main
- name: add new translations
run: |
git add src/i18n/locales
- name: update language list
working-directory: src/i18n/locales
run: $GITHUB_WORKSPACE/.github/generate-lngs.sh > ../lngs-generated.ts

- name: add new translations
run: |
git add src/i18n/
- name: upload translations
run: |
if git commit -m "Automatically update translation keys"; then
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Deploy Crowdin keys
name: Crowdin » Upload keys

on:
push:
Expand All @@ -14,7 +14,7 @@ jobs:
if: github.repository_owner == 'opencast'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: prepare crowdin client
run: |
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/playwright-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,16 @@ jobs:

steps:
- name: Check out source code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install Node Dependency
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: Install dependencies
run: npm ci

- name: Install Playwright
run: npm i -D @playwright/test

- name: Install supported browsers
run: npx playwright install

Expand All @@ -52,7 +49,8 @@ jobs:
run: npx playwright test --config=playwright.config.ts

- name: Upload tests results
uses: actions/upload-artifact@v3
if: success() || failure()
uses: actions/upload-artifact@v4
with:
name: test-results
path: test-results/
17 changes: 8 additions & 9 deletions .github/workflows/update-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
id: build-path

- name: Checkout Sources
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{github.event.pull_request.head.ref}}
repository: ${{github.event.pull_request.head.repo.full_name}}

- name: Use Node.js 18.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: Clean install
run: npm ci
Expand All @@ -52,7 +52,7 @@ jobs:
ssh-keyscan github.com >> ~/.ssh/known_hosts
- name: Wait for previous workflows to finish
uses: softprops/turnstyle@v1
uses: softprops/turnstyle@v2
with:
same-branch-only: false
env:
Expand Down Expand Up @@ -92,9 +92,8 @@ jobs:
git push origin gh-pages
- name: Add comment with deployment location
uses: thollander/actions-comment-pull-request@main
uses: thollander/actions-comment-pull-request@v3
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
message: >
This pull request is deployed at
[test.editor.opencast.org/${{ steps.build-path.outputs.build }}
Expand Down Expand Up @@ -139,10 +138,10 @@ jobs:

steps:
- name: Checkout Sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get changed locale files
uses: dorny/paths-filter@v2
uses: dorny/paths-filter@v3
id: filter_locales
with:
filters: | # !(pattern) matches anything but pattern
Expand All @@ -151,7 +150,7 @@ jobs:
- name: Check for changes in translations
if: steps.filter_locales.outputs.locales == true
uses: actions/github-script@v6
uses: actions/github-script@v7
with:
script: |
core.setFailed('You should not alter translations outside of Crowdin.')
6 changes: 3 additions & 3 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js 18.x
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20

- name: Clean install
run: npm ci
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/vitest-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Vitest tests

on:
push:
branches-ignore:
- 'dependabot/**'
pull_request:
branches:
- main

jobs:
test:
runs-on: ubuntu-latest

steps:
- name: Check out source code
uses: actions/checkout@v4

- name: Install Node Dependency
uses: actions/setup-node@v4
with:
node-version: 20

- name: Install dependencies
run: npm ci

- name: Execute Vitest tests
run: npm run test
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ Translating the Editor
-------------
You can help translating the editor to your language on [crowdin.com/project/opencast-editor](https://crowdin.com/project/opencast-editor). Simply request to join the project on Crowdin and start translating. If you are interested in translating a language which is not a target language right now, please create [a GitHub issue](https://github.com/opencast/opencast-editor/issues) and we will add the language.

This project follows the general form of [Opencast's Localization Process](https://docs.opencast.org/develop/developer/#participate/localization/), especially regarding what happens when you need to [change an existing translation key](https://docs.opencast.org/develop/developer/#participate/localization/#i-need-to-update-the-wording-of-the-source-translation-what-happens). Any questions not answered there should be referred to the mailing lists!

Notes on Waveform Generation
----------------------------
Expand Down
16 changes: 15 additions & 1 deletion editor-settings.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,19 @@
# Default: true
#show = true

# Ensure that at least one video stream remains selected
# Typically, the track selection ensures that at least one video stream
# remains selected. If you would like your users to be able to create selections
# with only audio streams, set this to false.
# Default: true
#atLeastOneVideo = true

# Disables track selection for events with more than two videos
# If your Opencast can handle track selection for more than two videos, set this
# to false.
# Default: true
#atMostTwoVideos = true

####
# Subtitles
##
Expand All @@ -101,7 +114,8 @@
[subtitles.languages]
## A list of languages for which new subtitles can be created
# For each language, various tags can be specified
# A list of officially recommended tags can be found at: TODO: link to opencast documentation for subtitle tags
# A list of officially recommended tags can be found at
# https://docs.opencast.org/develop/admin/#configuration/subtitles/#tags
# At least the "lang" tag MUST be specified
german = { lang = "de-DE" }
english = { lang = "en-US", type = "closed-caption" }
Expand Down
Loading

0 comments on commit fc9ea4a

Please sign in to comment.