Skip to content

Fix admin submodule PR filing #1545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gregorydlogan wants to merge 4 commits into
base: r/18.x
Choose a base branch
from
+23 −14
Open

Fix admin submodule PR filing #1545

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c8e285
Correcting gh pr creation. Branch name needs to be the same everywhe…
gregorydlogan Apr 1, 2026
4148112
Cleaning up branch names so they're more sane
gregorydlogan Apr 2, 2026
1fa6e19
Branch must be pushed prior to gh usage
gregorydlogan Apr 2, 2026
9082ca8
Correcting module in use
gregorydlogan Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions .github/workflows/deploy-main-branches.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ concurrency:

jobs:
detect-repo-owner:
name: Detect branch and appropriate server
if: github.repository_owner == 'opencast'
runs-on: ubuntu-latest
outputs:
Expand All @@ -36,6 +37,7 @@ jobs:


deploy-main-branches:
name: Deploy admin-interface.opencast.org
runs-on: ubuntu-latest
needs: detect-repo-owner
steps:
Expand Down Expand Up @@ -124,7 +126,7 @@ jobs:
run: |
git clone -b ${{ github.ref_name }} "git@github.com:${{ github.repository_owner }}/opencast.git" opencast
cd opencast
git checkout -b t/admin-$GITHUB_REF
git checkout -b t/admin-${{ needs.detect-repo-owner.outputs.branch }}

- name: Update the admin submodule
working-directory: opencast
Expand All @@ -133,19 +135,26 @@ jobs:
# and we don't have a guarantee that the update triggered by commit A does not end up finding commit B
# We are going to ignore this possibility since we almost universally want the *latest* commit, though this
# could end up causing the commit message, and the actual submodule hash to differ.
git submodule update --init --remote modules/admin-ui
git add modules/admin-ui
git commit -m "Updating admin-service to $GITHUB_REF"
git push origin t/admin-$GITHUB_REF
git submodule update --init --remote modules/admin
git add modules/admin
git commit -m "Updating admin-service to ${{ github.sha }}"
# This token is an account wide token which allows creation of PRs and pushes.
echo "${{ secrets.MODULE_PR_TOKEN }}" > token.txt
gh auth login --with-token < token.txt
gh pr create \
--title "Update ${{ needs.detect-repo-owner.outputs.branch }} Admin Interface to $GITHUB_REF" \
--body "Updating Opencast ${{ needs.detect-repo-owner.outputs.branch }} Admin Interface module to [$GITHUB_REF](https://github.com/${{ github.repository_owner }}/admin-interface/commit/$GITHUB_REF)" \
--head=${{ github.repository_owner }}:t/admin-$GITHUB_REF \
--base ${{ github.ref_name }} \
-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 \
export CURRENT_PR=$(gh pr list -R ${{ github.repository_owner }}/opencast --head t/admin-${{ needs.detect-repo-owner.outputs.branch }} --json number --jq '.[].number')
git push origin t/admin-${{ needs.detect-repo-owner.outputs.branch }} --force
if [ -n "$CURRENT_PR" ]; then
gh pr edit $CURRENT_PR \
--body "Updating Opencast ${{ needs.detect-repo-owner.outputs.branch }} Admin Interface module to [${{ github.sha }}](https://github.com/${{ github.repository_owner }}/admin-interface/commit/${{ github.sha }})" \
-R ${{ github.repository_owner }}/opencast
else
gh pr create \
--title "Update ${{ needs.detect-repo-owner.outputs.branch }} Admin Interface" \
--body "Updating Opencast ${{ needs.detect-repo-owner.outputs.branch }} Admin Interface module to [${{ github.sha }}](https://github.com/${{ github.repository_owner }}/admin-interface/commit/${{ github.sha }})" \
--head=${{ github.repository_owner }}:t/admin-${{ needs.detect-repo-owner.outputs.branch }} \
--base ${{ github.ref_name }} \
-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 \
fi
Loading