Merge branch 'main' into filter-known-deprecationwarnings

zmievsa · Dec 12, 2024 · 1bd6cde · 1bd6cde
2 parents ff42f94 + 4d8fe9d
commit 1bd6cde
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,6 +10,7 @@ on:
     branches: [main, 3.x.x]
     types: [opened, synchronize]
     paths:
+      - ".github/workflows/ci.yaml"  # self
       - "**.py"
       - "**.toml"
       - "**.lock"
@@ -42,10 +43,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - run: uv run coverage run --source=. --parallel-mode -m pytest tests
       - name: Upload coverage results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.os == 'ubuntu-latest' # Cross-platform coverage combination doesn't work
         with:
-          name: main-tests-coverage-results
+          name: coverage-results-${{ matrix.python-version }}
           path: coverage/
   Tutorial-tests:
     runs-on: ubuntu-latest
@@ -60,24 +61,20 @@ jobs:
       - run: pip install pytest coverage dirty-equals
       - run: coverage run --source=. --parallel-mode -m pytest docs_src
       - name: Upload coverage results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: docs-tests-coverage-results
+          name: coverage-results-docs
           path: coverage/
   Coverage:
     needs: [Tests, Tutorial-tests]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Download main tests coverage info
-        uses: actions/download-artifact@v3
+      - name: Download coverage info
+        uses: actions/download-artifact@v4
         with:
-          name: main-tests-coverage-results
-          path: coverage/
-      - name: Download docs tests coverage info
-        uses: actions/download-artifact@v3
-        with:
-          name: docs-tests-coverage-results
+          pattern: coverage-results-*
+          merge-multiple: true
           path: coverage/
       - uses: actions/setup-python@v5
         with:

diff --git a/.github/workflows/publish_docs.yaml b/.github/workflows/publish_docs.yaml
@@ -14,11 +14,11 @@ jobs:
         run: |
           git config user.name github-actions[bot]
           git config user.email 41898282+github-actions[bot]@users.noreply.github.com
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           key: mkdocs-material-${{ env.cache_id }}
           path: .cache