Merge branch 'develop' into fix_get_ci_fixes-1

.github/workflows/build.yml

@@ -68,7 +68,7 @@ jobs:
           git config --global --add safe.directory $(pwd)
           .ci/retrofit-worktree.sh worktree-image /sage
 
-      - name: Incremental build, test changed files (sage -t --new)
+      - name: Incremental build
         id: incremental
         run: |
           # Now re-bootstrap and build. The build is incremental because we were careful with the timestamps.

.github/workflows/lint.yml

@@ -38,43 +38,9 @@ jobs:
 
     - name: Code style check with pycodestyle
       run: tox -e pycodestyle-minimal
-  lint-relint:
-    name: Code style check with relint
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Merge CI fixes from sagemath/sage
-      if: ${{ github.event_name == 'pull_request' || github.event.repository.fork }}
-      run: |
-        .ci/merge-fixes.sh
-      env:
-        GH_TOKEN: ${{ github.token }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.9
-    - name: Install relint
-      run: pip install tox relint
-    - name: Lint using relint
+
+    - name: Code style check with relint
       run: tox -e relint -- src/sage/
-  lint-rst:
-    name: Validate docstring markup as RST
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v4
-    - name: Merge CI fixes from sagemath/sage
-      if: ${{ github.event_name == 'pull_request' || github.event.repository.fork }}
-      run: |
-        .ci/merge-fixes.sh
-      env:
-        GH_TOKEN: ${{ github.token }}
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.9
-    - name: Install tox
-      run: pip install tox
-    - name: Lint using tox -e rst
+
+    - name: Validate docstring markup as RST
       run: tox -e rst