Merge remote-tracking branch 'origin/develop' into 296-terms-of-use

Author: pselsa

.github/demo-page.html

@@ -17,3 +17,8 @@ updates:
     open-pull-requests-limit: 15
     labels:
       - type:dependencies
+    groups:
+      minor-and-patch:
+        update-types:
+          - minor
+          - patch

.github/dependabot.yml

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+if [ $# -ne 1 ]; then
+  echo "Usage: $0 OC_VERSION"
+  echo " eg: $0 r/16.x -> Returns the current correct server for r/16.x"
+  exit 1
+fi
+
+git clone https://github.com/opencast/opencast.git ~/opencast
+cd ~/opencast
+
+#Get the list of *all* branches in the format remotes/origin/r/N.m
+#grep for r/N.x
+#then use cut to remove remotes/origin
+#then use sort, with a field delimiter of '/', sorting on the *second* key in 'n'umeric 'r'evers order
+#then only consider the first 3 entries
+ary=( develop `git branch -a | grep origin | grep 'r/[0-9]*.x' | cut -f 3- -d '/' | sort -t '/' -k 2nr | head -n 3` )
+
+#Iterate through the array above.
+#If the script input matches the first item, spit out develop
+#If the script iput matches hte second item... etc
+#If it doesn't match anything, then don't say anything
+for i in "${!ary[@]}"
+do
+  if [[ "${ary[i]}" = "$1" ]]; then
+    if [[ $i -eq 0 ]]; then
+      echo "develop.opencast.org"
+      exit 0
+    elif [[ $i -eq 1 ]]; then
+      echo "stable.opencast.org"
+      exit 0
+    elif [[ $i -eq 2 ]]; then
+      echo "legacy.opencast.org"
+      exit 0
+    fi
+  fi
+done

.github/get-release-server.sh

@@ -7,10 +7,10 @@ on:
 jobs:
   main:
     if: github.event.pull_request.user.login != 'dependabot[bot]'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - 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 }}"
@@ -23,7 +23,7 @@ jobs:
           message: >
             Hi @${{ github.event.pull_request.user.login }}
 
-            Thank you for contributing to the Opencast Editor.
+            Thank you for contributing to the Opencast Admin UI.
 
             We noticed that you have not yet filed an [Individual Contributor License Agreement](https://www.apereo.org/licensing/agreements/icla).
             Doing that (once) helps us to ensure that Opencast stays free for all.

.github/workflows/check-icla.yml

@@ -1,7 +1,7 @@
 # This workflow runs on any change made to a pull-request and aims to verify
 # that the correct label is present.
 
-name: Check proper lable usage
+name: Check proper label usage
 
 on:
   pull_request_target:

.github/workflows/check-label.yml

@@ -1,39 +1,36 @@
 on:
-  push:
-    tags:
-      - '*-*-*'
+  workflow_dispatch:
 
-name: Create release draft
+name: Create release tag
 
 jobs:
   build:
-    name: Create release from tag
+    name: Create release tag
     runs-on: ubuntu-latest
     steps:
       - name: checkout code
         uses: actions/checkout@v4
-
-      - name: get node.js
-        uses: actions/setup-node@v4
         with:
-          node-version: 20
+          fetch-depth: 0
 
-      - name: download dependencies
-        run: npm ci
+      - name: prepare git
+        run: |
+          git config --global user.email 'cloud@opencast.org'
+          git config --global user.name 'Release Bot'
 
-      - name: build release
+      - name: tag and push
         env:
-          PUBLIC_URL: /admin-ui
-        run: npm run build
-
-      - name: create release tarball
-        working-directory: build
-        run: tar -czf "../oc-admin-ui-$(date -u +%F).tar.gz" *
-
-      - name: create new release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: ./oc-admin-ui-*.tar.gz
-          draft: true
-          fail_on_unmatched_files: true
-          generate_release_notes: true
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          #Translate 'develop' to 18.x or whatever is appropriate
+          if [ "develop" == "${{ github.ref_name }}" ]; then
+            #NB normally we only clone just the head ref, but fetch-depth: 0 above gets *all* the history
+            export TEMP="$((`git branch -a | grep r/ | cut -f 4 -d '/' | cut -f 1 -d '.'` + 1)).x"
+          else
+            export TEMP=${{ github.ref_name }}
+          fi
+          export TAG=${TEMP#r\/}-`date +%Y-%m-%d`
+          git tag $TAG
+          git push origin $TAG
+          sleep 2
+          gh workflow run process-release.yml -r $TAG

.github/workflows/create-release.yml

@@ -3,7 +3,8 @@ name: Crowdin » Upload keys
 on:
   push:
     branches:
-      - main
+      - develop
+      - r/*
 
 concurrency:
   group: crowdin-${{ github.ref }}
@@ -25,4 +26,4 @@ jobs:
       env:
         CROWDIN_TOKEN: ${{ secrets.CROWDIN_TOKEN }}
       run: |
-        crowdin upload sources --config .crowdin.yaml -b main
+        crowdin upload sources --config .crowdin.yaml -b "${GITHUB_REF##*/}"

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

@@ -22,6 +22,9 @@ jobs:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
 
+      - name: Prepare commit hash
+        run: git rev-parse HEAD > commit
+
       - name: Log in to the container registry
         uses: docker/login-action@v3
         with:
@@ -45,9 +48,9 @@ jobs:
 
       - name: Add comment
         if: github.event_name == 'pull_request_target'
-        uses: thollander/actions-comment-pull-request@v2
+        uses: thollander/actions-comment-pull-request@v3
         with:
-          comment_tag: container-image
+          comment-tag: container-image
           message: |
             Use `docker` or `podman` to test this pull request locally.
 

.github/workflows/deploy-container-image.yaml

@@ -1,18 +1,41 @@
-name: Publish Test Page
+name: Build & Deploy main brances
 
 on:
   push:
     branches:
-      - main
+      - develop
+      - r/*
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
 
 jobs:
-  build:
+  detect:
     if: github.repository_owner == 'opencast'
     runs-on: ubuntu-latest
+    outputs:
+      server: ${{ steps.test-server.outputs.server }}
+      branch: ${{ steps.branch-name.outputs.branch }}
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Determine the correct test server
+        id: test-server
+        run: echo "server=https://`./.github/get-release-server.sh ${{ github.ref_name }}`" >> $GITHUB_OUTPUT
+
+      - name: Determine branch name
+        id: branch-name
+        run: |
+          #Temp becomes something like r/17.x
+          export TEMP=${{ github.ref_name }}
+          #Strip the r/ prefix, giving us just 17.x.  If this is main/develop this does nothing
+          echo "branch=${TEMP#r\/}" >> $GITHUB_OUTPUT
+
+  main:
+    runs-on: ubuntu-latest
+    needs: detect
     steps:
       - name: checkout code
         uses: actions/checkout@v4
@@ -26,40 +49,37 @@ jobs:
         run: npm ci
 
       - name: build project
-        run: npm run build
+        run: |
+          npm run build
+        env:
+          VITE_TEST_SERVER_URL: ${{needs.detect.outputs.server}}
+          NODE_ENV: development
+          VITE_TEST_SERVER_AUTH: "admin:opencast"
 
-      - name: create pages directory
-        run: mkdir gh-pages
 
-      - name: include admin interface
-        run: mv build gh-pages/admin-ui
+      - name: Prepare git
+        run: |
+          git config --global user.name "Release Bot"
+          git config --global user.email "cloud@opencast.org"
 
-      - name: include mock data
-        working-directory: ./gh-pages
-        run: cp -rv ../test/GET/* .
+      - name: Commit new version
+        run: |
+          git fetch --unshallow origin gh-pages
+          git checkout gh-pages
+          # Update gh-pages
+          rm -rf $BRANCH
+          mv build $BRANCH
+          #Generate an index, in case anyone lands at the root of the test domain
+          echo '<html><body><ul>' > index.html
+          find . -mindepth 1 -maxdepth 1 -type d \
+            | grep '[0-9]*.x\|develop' \
+            | sort -r \
+            | sed 's/^\(.*\)$/<li><a href=\1>\1<\/a><\/li>/' >> index.html
+          echo '</ul></body></html>' >> index.html
+          git add $BRANCH index.html
+          git diff --staged --quiet || git commit --amend -m "Build $(date)"
+        env:
+          BRANCH: ${{needs.detect.outputs.branch}}
 
-      - name: include landing page
-        run: cp .github/demo-page.html gh-pages/index.html
-
-      - name: upload test page artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: ./gh-pages
-
-  deploy:
-    if: github.repository_owner == 'opencast'
-    needs: build
-
-    permissions:
-      pages: write
-      id-token: write
-
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-
-    runs-on: ubuntu-latest
-    steps:
-      - name: deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
+      - name: Push updates
+        run: git push origin gh-pages --force