Skip to content

Commit 98c746e

Browse files
gregorydlogangregorydlogan
committed
Merge branch 'r/18.x' into develop
2 parents c360acd + 7753c8e commit 98c746e

14 files changed

+242
-141
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
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:
12-
- uses: actions/setup-python@v6
13-
1412
- name: Install Python module
1513
run: pip install --break-system-packages apereocla
1614

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

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,38 @@
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
1515
# See https://github.com/jesusvasquez333/verify-pr-label-action
1616
- name: Verify PR label action
1717
uses: jesusvasquez333/verify-pr-label-action@v1.4.0
1818
with:
19-
github-token: '${{ secrets.GITHUB_TOKEN }}'
20-
valid-labels: 'type:tests, type:infrastructure, type:enhancement, type:feature, type:dependencies, type:documentation, type:accessibility, type:security, type:bug, type:usability, type:visual-clarity, type:code-quality'
21-
invalid-labels: 'status:duplicate, status:conflicts, status:wontfix'
22-
pull-request-number: '${{ github.event.pull_request.number }}'
19+
github-token: "${{ secrets.GITHUB_TOKEN }}"
20+
valid-labels: >
21+
type:tests,
22+
type:infrastructure,
23+
type:enhancement,
24+
type:feature,
25+
type:dependencies,
26+
type:documentation,
27+
type:accessibility,
28+
type:security,
29+
type:bug,
30+
type:usability,
31+
type:visual-clarity,
32+
type:code-quality
33+
invalid-labels: >
34+
status:duplicate,
35+
status:conflicts,
36+
status:wontfix
37+
pull-request-number: "${{ github.event.pull_request.number }}"
2338
disable-reviews: true

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

Lines changed: 2 additions & 2 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

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,37 @@ 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@v5
1414

15-
- name: prepare git
15+
- name: Prepare git
1616
run: |
17-
git config --global user.email 'crowdin-bot@editor.opencast.org'
17+
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: update language list
31+
- name: Update language list
3232
working-directory: src/i18n/locales
3333
run: $GITHUB_WORKSPACE/.github/generate-lngs.sh > ../lngs-generated.ts
3434

35-
- name: add new translations
35+
- name: Add new translations
3636
run: |
3737
git add src/i18n/
3838
39-
- name: upload translations
39+
- name: Upload translations
4040
run: |
4141
if git commit -m "Automatically update translation keys"; then
4242
git push

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ on:
77
- r/*
88

99
concurrency:
10-
group: crowdin
10+
group: crowdin-${{ github.ref }}
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@v5
1919

20-
- name: prepare crowdin client
20+
- name: Prepare crowdin client
2121
run: |
22-
wget --quiet https://artifacts.crowdin.com/repo/deb/crowdin3.deb -O crowdin.deb
23-
sudo dpkg -i crowdin.deb
22+
wget --quiet https://artifacts.crowdin.com/repo/deb/crowdin3.deb
23+
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/update.yml renamed to .github/workflows/deploy-main-branches.yml

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

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

1313
jobs:
14-
detect:
14+
detect-repo-owner:
15+
if: github.repository_owner == 'opencast'
1516
runs-on: ubuntu-latest
1617
outputs:
1718
server: ${{ steps.test-server.outputs.server }}
@@ -22,7 +23,7 @@ jobs:
2223

2324
- name: Determine the correct test server
2425
id: test-server
25-
run: echo "server=`./.github/get-release-server.sh ${{ github.ref_name }}`" >> $GITHUB_OUTPUT
26+
run: echo "server=https://`./.github/get-release-server.sh ${{ github.ref_name }}`" >> $GITHUB_OUTPUT
2627

2728
- name: Determine branch name
2829
id: branch-name
@@ -32,29 +33,29 @@ jobs:
3233
#Strip the r/ prefix, giving us just 17.x. If this is main/develop this does nothing
3334
echo "branch=${TEMP#r\/}" >> $GITHUB_OUTPUT
3435
35-
main:
36+
deploy-main-branches:
3637
runs-on: ubuntu-latest
37-
needs: detect
38+
needs: detect-repo-owner
3839
steps:
3940
- name: Checkout sources
4041
uses: actions/checkout@v5
4142

42-
- name: Use Node.js
43+
- name: Get Node.js
4344
uses: actions/setup-node@v5
4445
with:
4546
node-version: 20
4647

47-
- name: Clean install
48+
- name: Run npm ci
4849
run: npm ci
4950

50-
- name: Build App
51+
- name: Build the app
5152
run: |
5253
# This set the editor's datasource to the relevant test server
5354
sed -i "s#develop.opencast.org#$SERVER#g" public/editor-settings.toml
5455
npm run build
5556
env:
56-
SERVER: ${{needs.detect.outputs.server}}
57-
PUBLIC_URL: ${{needs.detect.outputs.branch}}
57+
SERVER: ${{needs.detect-repo-owner.outputs.server}}
58+
PUBLIC_URL: ${{needs.detect-repo-owner.outputs.branch}}
5859
VITE_APP_SETTINGS_PATH: editor-settings.toml
5960

6061
# tests are currently failing
@@ -64,7 +65,7 @@ jobs:
6465

6566
- name: Prepare git
6667
run: |
67-
git config --global user.name "Release Bot"
68+
git config --global user.name "Editor Deployment Bot"
6869
git config --global user.email "cloud@opencast.org"
6970
7071
- name: Commit new version
@@ -85,7 +86,7 @@ jobs:
8586
git add $BRANCH index.html
8687
git diff --staged --quiet || git commit --amend -m "Build $(date)"
8788
env:
88-
BRANCH: ${{needs.detect.outputs.branch}}
89+
BRANCH: ${{needs.detect-repo-owner.outputs.branch}}
8990

9091
- name: Push updates
9192
run: git push origin gh-pages --force

.github/workflows/update-test.yml renamed to .github/workflows/pr-deploy-test-branch.yml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Publish Pull Request Page
1+
name: PRs » Publish Pull Request Page
22

33
on:
44
pull_request_target:
@@ -11,10 +11,8 @@ concurrency:
1111
cancel-in-progress: false
1212

1313
jobs:
14-
detect:
15-
needs: member
16-
if: ${{ needs.member.outputs.is_team_member == 'true'
17-
|| github.event.pull_request.head.repo.full_name == 'opencast/opencast-editor' }}
14+
detect-repo-owner:
15+
if: github.repository_owner == 'opencast'
1816
runs-on: ubuntu-latest
1917
outputs:
2018
server: ${{ steps.test-server.outputs.server }}
@@ -28,7 +26,7 @@ jobs:
2826

2927
- name: Determine the correct test server
3028
id: test-server
31-
run: echo "server=`./.github/get-release-server.sh ${{ github.ref_name }}`" >> $GITHUB_OUTPUT
29+
run: echo "server=https://`./.github/get-release-server.sh ${{ github.ref_name }}`" >> $GITHUB_OUTPUT
3230

3331
- name: Determine branch name
3432
id: branch-name
@@ -38,43 +36,43 @@ jobs:
3836
#Strip the r/ prefix, giving us just 17.x. If this is main/develop this does nothing
3937
echo "branch=${TEMP#r\/}" >> $GITHUB_OUTPUT
4038
41-
main:
39+
deploy-pr:
4240
runs-on: ubuntu-latest
43-
needs: detect
41+
needs: detect-repo-owner
4442
steps:
45-
- name: generate build path
43+
- name: Generate build path
4644
run: echo "build=${{github.event.number}}/$(date +%Y-%m-%d_%H-%M-%S)/" >> $GITHUB_OUTPUT
4745
id: build-path
4846

49-
- name: Checkout Sources
47+
- name: Checkout sources
5048
uses: actions/checkout@v5
5149
with:
5250
ref: ${{github.event.pull_request.head.ref}}
5351
repository: ${{github.event.pull_request.head.repo.full_name}}
5452

55-
- name: Use Node.js
53+
- name: Get Node.js
5654
uses: actions/setup-node@v5
5755
with:
5856
node-version: 20
5957

60-
- name: Clean install
58+
- name: Run npm ci
6159
run: npm ci
6260

63-
- name: Build App
61+
- name: Build the app
6462
run: |
6563
# This set the editor's datasource to the relevant test server
6664
sed -i "s#develop.opencast.org#$SERVER#g" public/editor-settings.toml
6765
npm run build
6866
env:
69-
SERVER: ${{needs.detect.outputs.server}}
67+
SERVER: ${{needs.detect-repo-owner.outputs.server}}
7068
PUBLIC_URL: ${{ steps.build-path.outputs.build }}
7169

72-
- name: Prepare Git
70+
- name: Prepare git
7371
run: |
74-
git config --global user.name "Release Bot"
72+
git config --global user.name "Editor Deployment Bot"
7573
git config --global user.email "cloud@opencast.org"
7674
77-
- name: Prepare GitHub SSH key
75+
- name: Prepare GitHub SSH key from org level secret
7876
env:
7977
DEPLOY_KEY: ${{ secrets.DEPLOY_KEY_TEST }}
8078
run: |
@@ -84,7 +82,7 @@ jobs:
8482
ssh-keyscan github.com >> ~/.ssh/known_hosts
8583
8684
- name: Wait for previous workflows to finish
87-
uses: softprops/turnstyle@v3
85+
uses: softprops/turnstyle@v2
8886
with:
8987
same-branch-only: false
9088
env:
@@ -94,7 +92,7 @@ jobs:
9492
run: |
9593
git clone -b gh-pages "git@github.com:${{ github.repository_owner }}/opencast-editor-test.git" editor-test
9694
97-
- name: Store build
95+
- name: Store build in the clone
9896
env:
9997
DEPLOY_PATH: editor-test/${{ steps.build-path.outputs.build }}
10098
run: |
@@ -134,6 +132,7 @@ jobs:
134132
- name: Add comment with deployment location
135133
uses: thollander/actions-comment-pull-request@v3
136134
with:
135+
comment-tag: static-test-deployment
137136
message: >
138137
This pull request is deployed at
139138
[test.editor.opencast.org/${{ steps.build-path.outputs.build }}
@@ -142,7 +141,10 @@ jobs:
142141
It might take a few minutes for it to become available.
143142
144143
145-
member:
144+
#This is currently defunct, but kept around in case we run into issues in the future
145+
# where this check might be handy, cf spammers filing PRs or something.
146+
# Previously we checked is_team_member prior to doing anything else above
147+
check-member:
146148
name: Check organization membership
147149
if: github.repository_owner == 'opencast'
148150
runs-on: ubuntu-latest
@@ -173,7 +175,7 @@ jobs:
173175
exit: false
174176

175177

176-
translations:
178+
check-no-modified-translations:
177179
name: Translations only via Crowdin
178180
if: github.repository_owner == 'opencast'
179181
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)