Merge branch 'r/17.x' into group-await-calls

Author: Arnei

.github/get-release-server.sh

@@ -12,21 +12,26 @@ 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
-ary=( `git branch -a | grep 'r/[0-9]*.x' | head -n 3 | cut -f 3- -d '/'` )
+#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 [[ "${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/workflows/create-release.yml

@@ -19,8 +19,18 @@ jobs:
           git config --global user.name 'Release Bot'
 
       - name: tag and push
+        env:
+          GH_TOKEN: ${{ github.token }}
         run: |
-          export TEMP=${{ github.ref_name }}
+          #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/crowdin-upload-keys.yml

@@ -3,7 +3,8 @@ name: Crowdin » Upload keys
 on:
   push:
     branches:
-      - main
+      - develop
+      - r/*
 
 concurrency:
   group: crowdin-${{ github.ref }}

.github/workflows/deploy-main.yml

@@ -1,18 +1,41 @@
-name: Publish Test Page
+name: Build & Deploy main brances
 
 on:
   push:
     branches:
       - develop
-      - r/*.x
+      - r/*
 
 concurrency:
   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
@@ -25,16 +48,14 @@ jobs:
       - name: download dependencies
         run: npm ci
 
-      - name: determine the correct test server
-        id: vite-url
-        run: echo "VITE_TEST_SERVER_URL=`./.github/get-release-server.sh ${{ github.ref_name }}`" >> GITHUB_ENV
-
       - name: build project
+        run: |
+          npm run build
         env:
-          VITE_TEST_SERVER_URL: ${{ steps.vite-url.outputs.VITE_TEST_SERVER_URL }}
+          VITE_TEST_SERVER_URL: ${{needs.detect.outputs.server}}
           NODE_ENV: development
           VITE_TEST_SERVER_AUTH: "admin:opencast"
-        run: npm run build
+
 
       - name: Prepare git
         run: |
@@ -43,26 +64,22 @@ jobs:
 
       - name: Commit new version
         run: |
-          git fetch origin
+          git fetch --unshallow origin gh-pages
           git checkout gh-pages
-          #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
-          export TARGET=${TEMP#r\/}
           # Update gh-pages
-          rm -rf $TARGET
-          mkdir -p $TARGET
-          cp -r build/* $TARGET
+          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 -v .git \
+            | 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 $TARGET
+          git add $BRANCH index.html
           git diff --staged --quiet || git commit --amend -m "Build $(date)"
+        env:
+          BRANCH: ${{needs.detect.outputs.branch}}
 
       - name: Push updates
-        run: |
-          git push origin gh-pages --force
+        run: git push origin gh-pages --force

.github/workflows/deploy-test.yml

@@ -11,18 +11,44 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
+  detect:
+    if: ${{ github.event.pull_request.head.repo.full_name == 'opencast/opencast-admin-interface' }}
+    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
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - 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: generate build path
-        run: echo "::set-output name=build::${{github.event.number}}/$(date +%Y-%m-%d_%H-%M-%S)/" | sed 's_build::/*_build::_'
+        run: echo "build=${{github.event.number}}/$(date +%Y-%m-%d_%H-%M-%S)/" >> $GITHUB_OUTPUT
         id: build-path
 
       - name: checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
 
       - name: get node.js
         uses: actions/setup-node@v4
@@ -32,16 +58,13 @@ jobs:
       - name: download dependencies
         run: npm ci
 
-      - name: determine the correct test server
-        id: vite-url
-        run: echo "VITE_TEST_SERVER_URL=`./.github/get-release-server.sh ${{ github.base_ref }}`" >> GITHUB_ENV
-
       - name: build app
+        run: |
+          npm run build
         env:
-          VITE_TEST_SERVER_URL: ${{ steps.vite-url.outputs.VITE_TEST_SERVER_URL }}
+          VITE_TEST_SERVER_URL: ${{needs.detect.outputs.server}}
           NODE_ENV: development
           VITE_TEST_SERVER_AUTH: "admin:opencast"
-        run: npm run build
 
       - name: prepare git
         run: |
@@ -66,20 +89,24 @@ jobs:
 
       - name: clone repository
         run: |
-          git clone "git@github.com:opencast/opencast-admin-interface-test.git" admin-interface-test
+          git clone -b gh-pages "git@github.com:${{ github.repository_owner }}/opencast-admin-interface-test.git" admin-interface-test
 
-      - name: switch to gh-pages branch
-        working-directory: admin-interface-test
+      - name: store build
+        env:
+          DEPLOY_PATH: admin-interface-test/${{ steps.build-path.outputs.build }}
         run: |
-          git checkout gh-pages
+          mkdir -p ${DEPLOY_PATH}
+          cp -rv build/* ${DEPLOY_PATH}
 
-      - name: store build
+      - name: Cleanup test repository
         working-directory: admin-interface-test
         env:
-          DEPLOY_PATH: ${{ steps.build-path.outputs.build }}
+          GH_TOKEN: ${{ github.token }}
         run: |
-          mkdir -p ${DEPLOY_PATH}
-          cp -rv ../build/* ${DEPLOY_PATH}
+          wget https://raw.githubusercontent.com/${{ github.repository_owner }}/opencast-admin-interface-test/main/.github/scripts/cleanup-deployments.sh
+          bash cleanup-deployments.sh ${{ github.repository_owner }}/opencast-admin-interface
+          rm -f cleanup-deployments.sh
+          git add .
 
       - name: generate index.html
         working-directory: admin-interface-test
@@ -94,12 +121,12 @@ jobs:
         working-directory: admin-interface-test
         run: |
           git add .
-          git commit -m "Build ${{ steps.build-path.outputs.build }}"
+          git commit --amend -m "Build ${{ steps.build-path.outputs.build }}"
 
       - name: push updates
         working-directory: admin-interface-test
         run: |
-          git push origin gh-pages
+          git push origin gh-pages --force
 
       - name: add comment with deployment location
         uses: thollander/actions-comment-pull-request@v3

.github/workflows/process-release.yml

@@ -11,6 +11,10 @@ jobs:
     name: Create release from tag
     if: github.repository_owner == 'opencast'
     runs-on: ubuntu-latest
+    outputs:
+      checksum: ${{ steps.tarball.outputs.checksum }}
+      tag: ${{ steps.tarball.outputs.tag }}
+      branch: ${{ steps.tarball.outputs.branch }}
     permissions:
       contents: write #for the release
       pull-requests: write #For the PR in the upstream repo
@@ -33,12 +37,34 @@ jobs:
         run: npm run build
 
       - name: create release tarball
+        id: tarball
         working-directory: build
+        env:
+          GH_TOKEN: ${{ github.token }}
         run: |
           tar -czf "../oc-admin-ui-$(git describe --tags).tar.gz" *
-          echo INTERFACE_CHECKSUM=`sha256sum oc-admin-ui-$(git describe --tags).tar.gz | cut -f 1 -d " "` >> $GITHUB_ENV
-          echo INTERFACE_TAG=$(git describe --tags) >> $GITHUB_ENV
-          echo BASE_BRANCH=$(git describe --tags | cut -c 1-4) >> $GITHUB_ENV
+          echo checksum=`sha256sum ../oc-admin-ui-$(git describe --tags).tar.gz | cut -f 1 -d " "` >> $GITHUB_OUTPUT
+          echo tag=$(git describe --tags) >> $GITHUB_OUTPUT
+          while read branchname
+          do
+            #branchname looks like 'develop' or 'r/17.x', the describe + cut looks like '17.x', so we prefix with r/
+            # NB: branchname == develop *should not match* anything so that we fall back to the if case below
+            if [ "$branchname" != "r/`git describe --tags | cut -f 1 -d -`" ]; then
+              continue
+            fi
+            echo "Base branch is $branchname"
+            BASE_BRANCH="$branchname"
+            echo "branch=$branchname" >> $GITHUB_OUTPUT
+            break
+          done <<< `gh api \
+              -H "Accept: application/vnd.github+json" \
+              -H "X-GitHub-Api-Version: 2022-11-28" \
+              /repos/${{ github.repository_owner }}/opencast/branches?per_page=100 | \
+            jq -r '. | map(select(.name | match("r/[0-9]*.x|develop"))) | .[].name'`
+          if [ -z "${BASE_BRANCH}" ]; then
+            echo "Base branch is develop"
+            echo "branch=develop" >> $GITHUB_OUTPUT
+          fi
 
       - name: create new release
         uses: softprops/action-gh-release@v2
@@ -47,14 +73,24 @@ jobs:
           fail_on_unmatched_files: true
           generate_release_notes: true
 
+  upstream-pr:
+    name: Create upstream PR to incorporate release
+    if: github.repository_owner == 'opencast'
+    runs-on: ubuntu-latest
+    needs: build
+    permissions:
+      contents: write #for the release
+      pull-requests: write #For the PR in the upstream repo
+
+    steps:
       - name: Prepare git
         run: |
           git config --global user.name "Release Bot"
           git config --global user.email "cloud@opencast.org"
 
       - name: Prepare GitHub SSH key
         env:
-          DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
+          DEPLOY_KEY: ${{ secrets.MODULE_PR_DEPLOY_KEY }}
         run: |
           install -dm 700 ~/.ssh/
           echo "${DEPLOY_KEY}" > ~/.ssh/id_ed25519
@@ -63,24 +99,27 @@ jobs:
 
       - name: Clone upstream repository
         run: |
-          #This token is an account wide token which allows creation of PRs and pushes.
-          #echo "GH_TOKEN=${{ secrets.ACCESS_TOKEN }}" >> token.txt
-          #gh auth login --with-token < token.txt
-          git clone -b r/$BASE_BRANCH "git@github.com:opencast/opencast.git" ~/opencast
-          cd ~/opencast
-          git checkout -b t/admin-ui-$INTERFACE_TAG
+          git clone -b ${{ needs.build.outputs.branch }} "git@github.com:${{ github.repository_owner }}/opencast.git" opencast
+          cd opencast
+          git checkout -b t/admin-ui-${{ needs.build.outputs.tag }}
 
       - name: Update the admin ui pom file
-        #env:
-        #  GH_TOKEN: ${{ github.token }}
+        working-directory: opencast
         run: |
-          cd ~/opencast
-          sed -i "s#<interface.sha256>.*</interface.sha256>#<interface.sha256>$INTERFACE_CHECKSUM</interface.sha256>#" modules/admin-ui-interface/pom.xml
-          sed -i "s#<interface.url>.*</interface.url>#<interface.url>https://github.com/opencast/opencast-admin-interface/releases/download/$INTERFACE_TAG/oc-admin-ui-$INTERFACE_TAG.tar.gz</interface.url>#" modules/admin-ui-interface/pom.xml
+          sed -i "s#<interface.sha256>.*</interface.sha256>#<interface.sha256>${{ needs.build.outputs.checksum }}</interface.sha256>#" modules/admin-ui-interface/pom.xml
+          sed -i "s#<interface.url>.*</interface.url>#<interface.url>https://github.com/${{ github.repository_owner }}/opencast-admin-interface/releases/download/${{ needs.build.outputs.tag }}/oc-admin-ui-${{ needs.build.outputs.tag }}.tar.gz</interface.url>#" modules/admin-ui-interface/pom.xml
           git add modules/admin-ui-interface/pom.xml
-          git commit -m "Updating admin ui to $INTERFACE_TAG"
-          git push origin t/admin-ui-$INTERFACE_TAG
+          git commit -m "Updating admin ui to ${{ needs.build.outputs.tag }}"
+          git push origin t/admin-ui-${{ needs.build.outputs.tag }}
           #This token is an account wide token which allows creation of PRs and pushes.
-          echo "${{ secrets.PR_TOKEN }}" > token.txt
+          echo "${{ secrets.MODULE_PR_TOKEN }}" > token.txt
           gh auth login --with-token < token.txt
-          gh pr create --title "Update $BASE_BRANCH Admin UI to $INTERFACE_TAG" --label admin-ui --label maintenance --body "Updating Opencast $BASE_BRANCH Admin UI module to $INTERFACE_TAG" --head=opencast:t/admin-ui-$INTERFACE_TAG --base r/$BASE_BRANCH -R opencast/opencast
+          gh pr create \
+            --title "Update ${{ needs.build.outputs.branch }} Admin UI to ${{ needs.build.outputs.tag }}" \
+            --body "Updating Opencast ${{ needs.build.outputs.branch }} Admin UI module to [${{ needs.build.outputs.tag }}](https://github.com/${{ github.repository_owner }}/opencast-admin-interface/releases/tag/${{ needs.build.outputs.tag }})" \
+            --head=${{ github.repository_owner }}:t/admin-ui-${{ needs.build.outputs.tag }} \
+            --base ${{ needs.build.outputs.branch }} \
+            -R ${{ github.repository_owner }}/opencast
+            #FIXME: fine grained PATs can't apply labels
+            #FIXME: classic PATs don't have the permissions because the PR isn't in an opencastproject (the user) repo
+            #--label admin-ui --label maintenance \