Skip to content

Commit aafac8d

Browse files
ferishiliferishili
committed
Merge branch 'r/18.x' into issue-1290
2 parents 50dc453 + cdb2440 commit aafac8d

310 files changed

Lines changed: 9060 additions & 9919 deletions

File tree

Some content is hidden

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

‎.github/assets/index.css‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
@media (prefers-color-scheme: light) {
2+
:root {
3+
--header-color: linear-gradient(to bottom,#388ed6,#2075b1);
4+
--bg-color: #fafafa;
5+
--text-color: #0F0F0F;
6+
--container-color: #fafafa;
7+
--boxShadow-color: #0000004d;
8+
--border-color: #1d3041;
9+
--navbar-color: #24425c;
10+
--item-color: #ebeef1;
11+
--item-border: #c9d0d6;
12+
--item-hover: linear-gradient(to bottom, #fafafa, #e8ebef);
13+
--item-inner-boxShadow-color: #0000000d;
14+
--item-boxShadow-color: #96969626;
15+
}
16+
}
17+
18+
body {
19+
margin: 0px;
20+
background: var(--bg-color, #F8F4F1);
21+
font-family: Roboto Flex Variable, Roboto, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
22+
}
23+
24+
/* Text Container */
25+
.text-container {
26+
/* Layout */
27+
margin: 3% auto;
28+
max-width: 75%;
29+
padding: 10px 15px 10px 15px;
30+
31+
/* Styling */
32+
border-radius: 5px;
33+
background: var(--container-color, #F8F4F1);
34+
box-shadow: 0 1px 3px 1px var(--boxShadow-color, #0000004d);
35+
}
36+
.text-container > p {
37+
color: var(--text-color, #0F0F0F);
38+
text-align: center;
39+
font-size: 20px;
40+
font-weight: 400;
41+
}
42+
43+
/* Header */
44+
.head-container {
45+
width: 100%;
46+
height: 50px;
47+
box-shadow: 0 1px 3px 1px var(--boxShadow-color, #0000004d);
48+
position: relative;
49+
border-bottom: 1px solid var(--border-color, #1d3041);
50+
background: var(--header-color, linear-gradient(to bottom,#388ed6,#2075b1));
51+
52+
}
53+
.head-container > img {
54+
/*Image Style*/
55+
width: 100px;
56+
height: 20px;
57+
padding: 14px 20px 13px;
58+
}
59+
.navbar-container {
60+
width: 100%;
61+
min-height: 80px;
62+
background: var(--navbar-color, #24425c);
63+
}
64+
65+
/* Version-List */
66+
ul {
67+
list-style-type: none;
68+
display: flex;
69+
justify-content: center;
70+
align-items: center;
71+
flex-wrap: wrap;
72+
column-gap: 20px;
73+
row-gap: 10px;
74+
}
75+
76+
li {
77+
width: 160px;
78+
text-align: center;
79+
padding: 15px 10px;
80+
border-radius: 4px;
81+
border: 1px solid var(--item-border, #c9d0d6);
82+
background: var(--item-color, #ebeef1);
83+
box-shadow: inset 0 3px 10px 2px var(--item-inner-boxShadow-color, #0000000d), 0px 5px 10px 0px var(--item-boxShadow-color, #96969626);
84+
}
85+
86+
li:hover {
87+
background: var(--item-hover, linear-gradient(to bottom, #fafafa, #e8ebef));
88+
}
89+
90+
li > a {
91+
color: var(--text-color, #0F0F0F);
92+
font-size: 18px;
93+
font-weight: 400;
94+
text-decoration: none;
95+
padding:15px 50px;
96+
}

‎.github/assets/opencast-white.svg‎

Lines changed: 72 additions & 0 deletions
Loading

‎.github/workflows/check-icla.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: Check ICLA
1+
name: Check » ICLA
22
on:
33
pull_request_target:
44
types:
55
- opened
66

77
jobs:
8-
main:
8+
check-icla:
99
if: github.event.pull_request.user.login != 'dependabot[bot]'
1010
runs-on: ubuntu-24.04
1111
steps:

‎.github/workflows/check-label.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# This workflow runs on any change made to a pull-request and aims to verify
22
# that the correct label is present.
33

4-
name: Check proper label usage
4+
name: Check » Proper label usage
55

66
on:
77
pull_request_target:
88
types: [opened, labeled, unlabeled, synchronize]
99

1010
jobs:
11-
labels:
11+
check-labels:
1212
runs-on: ubuntu-latest
1313
steps:
1414
# Ensure that one of the required labels is present and none of the undesired is absent

‎.github/workflows/check-merge-conflict.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Merge conflict check
1+
name: Check » Merge conflicts
22
on:
33
push:
44
pull_request_target:
@@ -7,7 +7,7 @@ on:
77
- synchronize
88

99
jobs:
10-
main:
10+
check-merge-conflicts:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Check for dirty pull requests
@@ -18,4 +18,4 @@ jobs:
1818
commentOnDirty: |
1919
This pull request has conflicts ☹
2020
Please resolve those so we can review the pull request.
21-
Thanks.
21+
Thanks.

‎.github/workflows/crowdin-download-translations.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,33 @@ on:
66
workflow_dispatch:
77

88
jobs:
9-
update-translations:
9+
download-translations:
1010
if: github.repository_owner == 'opencast'
1111
runs-on: ubuntu-latest
1212
steps:
1313
- uses: actions/checkout@v4
1414

15-
- name: prepare git
15+
- name: Prepare git
1616
run: |
1717
git config --global user.email 'crowdin-bot@opencast.org'
1818
git config --global user.name 'Crowdin Bot'
1919
20-
- name: prepare crowdin client
20+
- name: Prepare crowdin client
2121
run: |
2222
wget --quiet https://artifacts.crowdin.com/repo/deb/crowdin3.deb -O crowdin.deb
2323
sudo dpkg -i crowdin.deb
2424
25-
- name: download translations
25+
- name: Download translations
2626
env:
2727
CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
2828
run: |
2929
crowdin download --config .crowdin.yaml -b main
3030
31-
- name: add new translations
31+
- name: Add new translations
3232
run: |
3333
git add src/i18n/org/opencastproject/adminui/languages/
3434
35-
- name: upload translations
35+
- name: Upload translations
3636
run: |
3737
if git commit -m "Automatically update translation keys"; then
3838
git push

‎.github/workflows/crowdin-upload-keys.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ concurrency:
1111
cancel-in-progress: true
1212

1313
jobs:
14-
deploy-translation-keys:
14+
upload-translation-keys:
1515
if: github.repository_owner == 'opencast'
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
1919

20-
- name: prepare crowdin client
20+
- name: Prepare crowdin client
2121
run: |
2222
wget --quiet https://artifacts.crowdin.com/repo/deb/crowdin3.deb
2323
sudo dpkg -i crowdin3.deb
2424
25-
- name: upload translation source
25+
- name: Upload translation source
2626
env:
2727
CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
2828
run: |
29-
crowdin upload sources --config .crowdin.yaml -b main
29+
crowdin upload sources --config .crowdin.yaml -b "${GITHUB_REF##*/}"

.github/workflows/deploy-main.yml renamed to .github/workflows/deploy-main-branches.yml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build & Deploy main brances
1+
name: Build » Deploy main branches
22

33
on:
44
push:
@@ -11,7 +11,7 @@ concurrency:
1111
cancel-in-progress: false
1212

1313
jobs:
14-
detect:
14+
detect-repo-owner:
1515
if: github.repository_owner == 'opencast'
1616
runs-on: ubuntu-latest
1717
outputs:
@@ -33,44 +33,46 @@ jobs:
3333
#Strip the r/ prefix, giving us just 17.x. If this is main/develop this does nothing
3434
echo "branch=${TEMP#r\/}" >> $GITHUB_OUTPUT
3535
36-
main:
36+
deploy-main-branches:
3737
runs-on: ubuntu-latest
38-
needs: detect
38+
needs: detect-repo-owner
3939
steps:
40-
- name: checkout code
40+
- name: Checkout sources
4141
uses: actions/checkout@v4
4242

43-
- name: get node.js
43+
- name: Get Node.js
4444
uses: actions/setup-node@v4
4545
with:
4646
node-version: 20
4747

48-
- name: download dependencies
48+
- name: Run npm ci
4949
run: npm ci
5050

51-
- name: build project
51+
- name: Build the app
5252
run: |
5353
npm run build
5454
env:
55-
VITE_TEST_SERVER_URL: ${{needs.detect.outputs.server}}
55+
VITE_TEST_SERVER_URL: ${{needs.detect-repo-owner.outputs.server}}
5656
NODE_ENV: development
5757
VITE_TEST_SERVER_AUTH: "admin:opencast"
5858

59-
6059
- name: Prepare git
6160
run: |
62-
git config --global user.name "Release Bot"
61+
git config --global user.name "Admin Interface Deployment Bot"
6362
git config --global user.email "cloud@opencast.org"
6463
6564
- name: Commit new version
6665
run: |
66+
# Save the current assets from the main branch
67+
mv .github/assets assets_temp
68+
# Update and change to the gh-pages branch
6769
git fetch --unshallow origin gh-pages
6870
git checkout gh-pages
6971
# Update gh-pages
7072
rm -rf $BRANCH
7173
mv build $BRANCH
7274
#Generate an index, in case anyone lands at the root of the test domain
73-
echo '<html><body><ul>' > index.html
75+
echo $'<html><head><link rel=stylesheet type=text/css href=assets/index.css /></head><body><div class="head-container"><img src=assets/opencast-white.svg /></div><div class="navbar-container"></div><div class="text-container"><p>Deployment for the latest development versions of the Opencast admin interface.The branches listed here correspond to Opencast\'s own branches.</br><b>Please select a version.</b></p></div><ul>' > index.html
7476
find . -mindepth 1 -maxdepth 1 -type d \
7577
| grep '[0-9]*.x\|develop' \
7678
| sort -r \
@@ -79,7 +81,16 @@ jobs:
7981
git add $BRANCH index.html
8082
git diff --staged --quiet || git commit --amend -m "Build $(date)"
8183
env:
82-
BRANCH: ${{needs.detect.outputs.branch}}
84+
BRANCH: ${{needs.detect-repo-owner.outputs.branch}}
85+
86+
- name: update CSS and other assets
87+
if: github.ref == 'refs/heads/develop'
88+
run: |
89+
rm -rf assets
90+
mv assets_temp assets
91+
git add assets
92+
git diff --staged --quiet || git commit --amend -m "Build $(date)"
93+
8394
8495
- name: Push updates
8596
run: git push origin gh-pages --force

.github/workflows/deploy-container-image.yaml renamed to .github/workflows/pr-deploy-container-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish container image
1+
name: PRs » Publish container image
22

33
on:
44
push:

0 commit comments

Comments
 (0)