Skip to content

Commit

Permalink
Merge branch 'main' into next
Browse files Browse the repository at this point in the history
There were some conflicts. An easy one in `package.json`, a managable
in `harvest/mod.rs` and two in the two main lock files. The Cargo.lock
one I resolved via `git checkout main -- backend/Cargo.lock` and then
`cargo build`. The `package-lock.json` I solved by running `npm i`
after resolving the conflict in `package.json`.
  • Loading branch information
LukasKalbertodt committed Dec 12, 2024
2 parents cfbce9f + 45a70db commit 4e1dc21
Show file tree
Hide file tree
Showing 43 changed files with 3,346 additions and 2,760 deletions.
Binary file added .github/readme-image.avif
Binary file not shown.
4 changes: 2 additions & 2 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Create release build
run: ./x.sh build-release
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install musl requisites
run: sudo apt install -y musl-dev musl-tools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-admin-ui-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
contents: read
steps:
- name: Check out the code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-authkit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out the code
uses: actions/checkout@v3
uses: actions/checkout@v4

- run: npm ci
working-directory: util/authkit
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
main:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- run: npm ci
working-directory: docs
- name: Build documentation
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Figure out build mode
- name: Determine build mode
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
options: '--name tobira_pg'

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
lfs: true
- uses: actions/download-artifact@v4
Expand Down Expand Up @@ -236,7 +236,7 @@ jobs:
# In these cases the results should also be saved, since they might
# indicate what went wrong. Hence `always()` instead of on `failure()`.
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: playwright-report
path: frontend/playwright-report/
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ permissions:
contents: read
pages: write
id-token: write
actions: read

concurrency:
group: deploy-docs
Expand All @@ -17,7 +18,7 @@ jobs:
build:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
# We need to fetch all tags to build versioned docs
fetch-depth: 0
Expand All @@ -32,7 +33,7 @@ jobs:
- name: Disable Jykell
run: touch docs/build/.nojekyll
- name: Upload built documentation as artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v3
with:
path: docs/build/

Expand All @@ -45,4 +46,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v4
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
github.actor == 'lkiesow'
) }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: prepare deploy key
env:
Expand All @@ -44,7 +44,7 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}

- name: Download artifacts from build workflow
uses: dawidd6/action-download-artifact@v3
uses: dawidd6/action-download-artifact@v6
with:
name: test-deployment-files
run_id: ${{ github.event.workflow_run.id }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/remove-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
if: github.repository_owner == 'elan-ev'
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: prepare deploy key
env:
Expand All @@ -37,7 +37,7 @@ jobs:
if: github.event_name != 'delete'

- name: Delete GitHub deployment status
uses: bobheadxi/deployments@v1.4.0
uses: bobheadxi/deployments@v1.5.0
with:
# We would like to `delete-env` instead, but this requires additional
# permissions for the GITHUB_TOKEN. Fixing that seems to be fairly
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/upload-db-dump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: '0' # We need to do a full clone to be able to switch the branch later

Expand Down
33 changes: 25 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,35 @@
![License](https://img.shields.io/github/license/elan-ev/tobira)
![Latest release](https://img.shields.io/github/v/release/elan-ev/tobira?label=latest%20release)

Tobira is a video portal for [Opencast](https://opencast.org).
It provides a hierarchical page structure, with each page consisting of simple configurable content blocks (e.g. text, videos or series).
Opencast content (series or single events) can be shown on these pages.
Users can upload, edit (via external editor) and share their videos.
Tobira is a video portal for [Opencast](https://opencast.org) and aims to be a pleasant interface through which users interact with your Opencast content.
It lets you present videos, series and playlists in a customizable, hierarchical page structure, but also makes it easy for users to search through all media.
Additionally, it offers tools to upload and manage videos.
It's possible to connect Tobira to virtually any authentication system and integrate it into your university's/organization's infrastructure.

The current version of our main branch is deployed at https://tobira.opencast.org.
This is just a test deployment and all data is wiped whenever it is re-deployed.
The test data was kindly provided by the ETH only for the purpose of this test deployment.
<p align="center">
<img src=".github/readme-image.avif" width="95%"></img>
</p>

You can try it out for yourself here: https://tobira.opencast.org.
This is a test deployment of the `main` branch, where most data is wiped whenever it is re-deployed.

## Documentation

[**Tobira's documentation**](https://elan-ev.github.io/tobira) (both, for people trying to install Tobira and devs trying to work on Tobira's code).
All our documentation lives here: [**Tobira's documentation**](https://elan-ev.github.io/tobira).
Among other things, it explains how to install and configure Tobira on your own server.


## Contribute

In short: clone this repository, run the following commands and then open http://localhost:8030/.

```bash
./x.sh containers start
./x.sh start
```

But please see [our developer documentation](https://elan-ev.github.io/tobira/dev) for more information.


### Name

Expand Down
Loading

0 comments on commit 4e1dc21

Please sign in to comment.