Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opencast/opencast
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 16.5
Choose a base ref
...
head repository: opencast/opencast
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Loading
Showing 963 changed files with 41,666 additions and 57,702 deletions.
4 changes: 4 additions & 0 deletions .crowdin.yaml
Original file line number Diff line number Diff line change
@@ -11,3 +11,7 @@ files:
-
source: '/modules/engage-paella-player-7/src/i18n/en-US.json'
translation: '/modules/engage-paella-player-7/src/i18n/%locale%.json'

-
source: '/modules/lti/src/i18n/lang-en_US.json'
translation: '/modules/lti/src/i18n/lang-%locale_with_underscore%.json'
19 changes: 19 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
<!--
Explain what this pull request does. If this fixes a bug, also explain how to reproduce the issue.
-->

<!--
If your pull request is targeting the legacy (second oldest release branch), explain why this patch is so important that
it needs to go into the legacy and can not go just into stable or develop.
-->

### How to test this patch

<!--
Explain how to test this patch. If this requires a particular set-up or configuration, explain that as well and provide
the necessary configuration if possible. The easier it is for others to test the patch, the faster this will get
reviewed and merged.
-->


### Your pull request should…

* [ ] have a concise title
@@ -7,3 +25,4 @@
* [ ] pass automated tests
* [ ] have a clean commit history
* [ ] [have proper commit messages (title and body) for all commits](https://medium.com/@steveamaza/e028865e5791)
* [ ] explain why it needs to be merged into the legacy branch, if it is targeting the legacy branch
14 changes: 9 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -12,27 +12,31 @@ updates:
interval: monthly
open-pull-requests-limit: 10
- package-ecosystem: npm
directory: "/modules/engage-ui"
directory: "/docs/checkstyle/eslint-config"
schedule:
interval: monthly
open-pull-requests-limit: 10
- package-ecosystem: npm
directory: "/modules/lti"
directory: "/modules/engage-ui"
schedule:
interval: monthly
open-pull-requests-limit: 10
- package-ecosystem: npm
directory: "/modules/runtime-info-ui"
directory: "/modules/lti"
schedule:
interval: monthly
groups:
fontawesome:
patterns:
- "@fortawesome*"
open-pull-requests-limit: 10
- package-ecosystem: npm
directory: "/modules/engage-paella-player-7"
directory: "/modules/runtime-info-ui"
schedule:
interval: monthly
open-pull-requests-limit: 10
- package-ecosystem: npm
directory: "/modules/admin-ui-frontend"
directory: "/modules/engage-paella-player-7"
schedule:
interval: monthly
open-pull-requests-limit: 10
6 changes: 1 addition & 5 deletions .github/workflows/build-maven-cache.yml
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 11
java-version: 17

- name: clone mvn.opencast.org
run: |
@@ -39,10 +39,6 @@ jobs:
tar \
unzip
- name: prepare build
run: |
sed -i 's/build --skipTests=${skipTests}/build --skipTests=true/' modules/admin-ui-frontend/pom.xml
- name: build opencast
run: |
mvn clean install -Pdev \
6 changes: 3 additions & 3 deletions .github/workflows/check-icla.yml
Original file line number Diff line number Diff line change
@@ -7,19 +7,19 @@ 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 }}"

- name: Comment if no CLA has been filed
if: ${{ failure() }}
uses: thollander/actions-comment-pull-request@main
uses: thollander/actions-comment-pull-request@v3
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
message: >
10 changes: 5 additions & 5 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
workflow_dispatch:
push:
workflow_dispatch:
tags:
- '*.*'

@@ -17,7 +17,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 11
java-version: 17

- name: install dependencies
run: |
@@ -42,9 +42,9 @@ jobs:
- name: Get the version
id: get_version
run: |
echo "::set-output name=VERSION::$GITHUB_REF" | sed 's_refs/tags/\([0-9]*\).\([0-9]*\)$_\1.\2_'
echo "::set-output name=VERSION_MAIN::$GITHUB_REF" | sed 's_refs/tags/\([0-9]*\).\([0-9]*\)$_\1_'
echo "::set-output name=VERSION_COMBINED::$GITHUB_REF" | sed 's_refs/tags/\([0-9]*\).\([0-9]*\)$_\1\2_'
echo "VERSION=$GITHUB_REF" | sed 's_refs/tags/\([0-9]*\).\([0-9]*\)$_\1.\2_' >> $GITHUB_OUTPUT
echo "VERSION_MAIN=$GITHUB_REF" | sed 's_refs/tags/\([0-9]*\).\([0-9]*\)$_\1_' >> $GITHUB_OUTPUT
echo "VERSION_COMBINED=$GITHUB_REF" | sed 's_refs/tags/\([0-9]*\).\([0-9]*\)$_\1\2_' >> $GITHUB_OUTPUT
- name: create new release
uses: softprops/action-gh-release@v2
34 changes: 0 additions & 34 deletions .github/workflows/dependabot-batcher.yml

This file was deleted.

10 changes: 9 additions & 1 deletion .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ concurrency:
jobs:
deploy-documentation:
if: github.repository_owner == 'opencast'
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

@@ -32,6 +32,14 @@ jobs:
run: |
python -m mkdocs build
- name: generate list of committers
working-directory: docs/guides/developer/
env:
GITHUB_USER: ${{ secrets.GH_USER }}
GITHUB_PA_TOKEN: ${{ secrets.GH_PA_TOKEN }}
run: |
./.generate-list-of-committers.sh
- name: build developer docs
working-directory: docs/guides/developer/
run: |
58 changes: 58 additions & 0 deletions .github/workflows/rpms-create-repository.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: RPMs » Create Repository

on:
workflow_dispatch:
push:
branches:
- develop

jobs:
build:
strategy:
matrix:
arch:
- noarch
- x86_64
el:
- 8
- 9
- 10
stage:
- testing
- release
name: create repo (el${{ matrix.el }}/${{ matrix.stage }}/${{ matrix.arch }})
runs-on: ubuntu-latest
if: github.repository == 'opencast/opencast'
steps:
- uses: actions/checkout@v4

- name: Install s3cmd, xpath and createrepo
run: |
set -eu
sudo apt update -q
sudo apt install -y -q s3cmd libxml-xpath-perl createrepo-c
- name: Get the version
id: get_version
run: |
xpath -e '/project/version/text()' pom.xml | sed 's/^\([0-9]*\)-SNAPSHOT$/::set-output name=VERSION::\1/'
- name: Configure s3cmd
uses: lkiesow/configure-s3cmd@v1
with:
host: ${{ secrets.S3_HOST }}
access_key: ${{ secrets.S3_ACCESS_KEY }}
secret_key: ${{ secrets.S3_SECRET_KEY }}

- name: Check/create new repository
env:
S3PATH: opencast-pkg/rpms/${{ matrix.stage }}/el/${{ matrix.el }}/oc-${{ steps.get_version.outputs.VERSION }}/${{ matrix.arch }}
run: |
set -eux
if ! s3cmd info s3://${S3PATH}/repodata/repomd.xml
then
mkdir ${{ matrix.arch }}
createrepo_c ${{ matrix.arch }}
cd ${{ matrix.arch }}
s3cmd put -P --recursive repodata s3://${S3PATH}/
fi
2 changes: 1 addition & 1 deletion .github/workflows/test-configuration.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ on:

jobs:
main:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
2 changes: 1 addition & 1 deletion .github/workflows/test-documentation-build.yml
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ jobs:

# Check documentation with markdownlint and build it using mkdocs
documentation:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
6 changes: 1 addition & 5 deletions .github/workflows/test-lti-tools.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ on:

jobs:
main:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4

@@ -23,10 +23,6 @@ jobs:
working-directory: modules/lti/
run: npm ci

- name: copy translation from where they do not belong
working-directory: modules/lti/
run: ./copy-translations.sh

- name: install selenium
working-directory: modules/lti/
run: pip install -r requirements.txt
Loading