Merge remote-tracking branch 'upstream/develop' into union-enumerate-inf

Author: user202729

.ci/README.md

@@ -22,6 +22,7 @@
 from json import loads
 from enum import Enum
 from datetime import datetime, timedelta
+import subprocess
 from subprocess import check_output, CalledProcessError
 
 datetime_format = '%Y-%m-%dT%H:%M:%SZ'
@@ -631,14 +632,16 @@ def gh_cmd(self, cmd, arg, option):
         issue = 'issue'
         if self._pr:
             issue = 'pr'
+        # workaround for gh bug https://github.com/cli/cli/issues/11055, it cannot deduce repo from url automatically
+        repo = '/'.join(self._url.split('/')[:5])
         if arg:
-            cmd_str = 'gh %s %s %s %s "%s"' % (issue, cmd, self._url, option, arg)
+            cmd_str = 'gh --repo %s %s %s %s %s "%s"' % (repo, issue, cmd, self._url, option, arg)
         else:
-            cmd_str = 'gh %s %s %s %s' % (issue, cmd, self._url, option)
+            cmd_str = 'gh --repo %s %s %s %s %s' % (repo, issue, cmd, self._url, option)
         debug('Execute command: %s' % cmd_str)
         ex_code = os.system(cmd_str)
         if ex_code:
-            warning('Execution of %s failed with exit code: %s' % (cmd_str, ex_code))
+            raise RuntimeError('Execution of %s failed with exit code: %s' % (cmd_str, ex_code))
 
     def edit(self, arg, option):
         r"""

.ci/head-tail.sh

@@ -121,7 +121,7 @@ jobs:
         # This step needs to happen after the commit sha is put in DOCKER_TAG
         # so that multi-stage builds can work correctly.
         run: |
-          .ci/merge-fixes.sh
+          .github/workflows/merge-fixes.sh
         env:
           GH_TOKEN: ${{ github.token }}
 
@@ -178,13 +178,13 @@ jobs:
           cd /sage
           ./sage -python -m pip install coverage
           ./sage -python -m coverage run --rcfile=src/tox.ini src/bin/sage-runtests --force-lib --long -p4 --format github --random-seed=286735480429121101562228604801325644303 ${{ matrix.tests }}
-        shell: sh .ci/docker-exec-script.sh BUILD . {0}
+        shell: sh .github/workflows/docker-exec-script.sh BUILD . {0}
 
       - name: Combine coverage results
         if: (success() || failure()) && steps.container.outcome == 'success'
         run: |
           ./sage -python -m coverage combine --rcfile=src/tox.ini
-        shell: sh .ci/docker-exec-script.sh BUILD /sage {0}
+        shell: sh .github/workflows/docker-exec-script.sh BUILD /sage {0}
 
       - name: Prepare upload
         id: copy-coverage
@@ -241,7 +241,7 @@ jobs:
         # This step needs to happen after the commit sha is put in DOCKER_TAG
         # so that multi-stage builds can work correctly.
         run: |
-          .ci/merge-fixes.sh
+          .github/workflows/merge-fixes.sh
         env:
           GH_TOKEN: ${{ github.token }}
 
@@ -306,7 +306,7 @@ jobs:
           ./sage -python -m coverage xml --rcfile=src/tox.ini --omit="/tmp/*"
           mkdir -p .coverage/coverage-report
           mv coverage.xml .coverage/coverage-report/
-        shell: sh .ci/docker-exec-script.sh BUILD . {0}
+        shell: sh .github/workflows/docker-exec-script.sh BUILD . {0}
 
       - name: Upload coverage to codecov
         if: (success() || failure()) && steps.container.outcome == 'success'