diff --git a/.github/workflows/docker-compose.yml.mysqldbdump b/.github/workflows/docker-compose.yml.mysqldbdump index f5f7610c93..e777641d00 100644 --- a/.github/workflows/docker-compose.yml.mysqldbdump +++ b/.github/workflows/docker-compose.yml.mysqldbdump @@ -16,7 +16,7 @@ services: retries: 10 edxapp: image: edxops/edxapp:latest - command: bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && /edx/app/edxapp/venvs/edxapp/bin/python manage.py lms migrate && /edx/app/edxapp/venvs/edxapp/bin/python manage.py cms migrate' + command: bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_db' volumes: - ../../:/edx/app/edxapp/edx-platform depends_on: diff --git a/.github/workflows/mysqldbdump.yml b/.github/workflows/mysqldbdump.yml index 23961eefbc..82fc774fb5 100644 --- a/.github/workflows/mysqldbdump.yml +++ b/.github/workflows/mysqldbdump.yml @@ -15,7 +15,7 @@ jobs: - name: Wait for migration to complete uses: jakejarvis/wait-action@master with: - time: '600s' + time: '900s' - name: Dump database run: docker exec -i edx.devstack.mysql mysqldump -u'edxapp001' -p'password' edxapp > edxapp.sql - name: Commit dump file to repo. diff --git a/.github/workflows/mysqldbdump_pr.sh b/.github/workflows/mysqldbdump_pr.sh index 42c8e7c194..2e3fd6fc8a 100755 --- a/.github/workflows/mysqldbdump_pr.sh +++ b/.github/workflows/mysqldbdump_pr.sh @@ -17,9 +17,14 @@ cd "$REPO_NAME" git config --global user.name "${GITHUB_USER}" git config --global user.email "${GITHUB_EMAIL}" -obsolete_dump_pr=`../hub-linux*/bin/hub pr list -s open | grep "${DB_NAME} MySQL database dump" | awk '{print $1}' | sed 's/\#//g'` -if [[ ! -z $obsolete_dump_pr ]]; then - ../hub-linux*/bin/hub issue update $obsolete_dump_pr -s closed +obsolete_dump_prs=`../hub-linux*/bin/hub pr list -s open --format '%I:%H %n' | grep 'github-actions-mysqldbdump'` + +if [[ ! -z $obsolete_dump_prs ]]; then + for pr in $obsolete_dump_prs; do + IFS=':' read pr_num branch <<< "$pr" + ../hub-linux*/bin/hub issue update ${pr_num} -s closed + ../hub-linux*/bin/hub push origin --delete ${branch} + done fi git checkout -b github-actions-mysqldbdump/$GITHUB_SHA