Merge remote-tracking branch 'ci/main' into use-gpu

spraakbanken · Nov 21, 2024 · 345a41e · 345a41e
2 parents 52dd8e0 + ca45aa5
commit 345a41e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 40 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -44,15 +44,7 @@ jobs:
           version: ${{ env.UV_VERSION }}
           enable-cache: true
 
-      - name: Load cached venv
-        id: cached-venv
-        uses: actions/cache@v4
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/uv.lock') }}
-
       - name: Install dependencies
-        if: steps.cached-venv.outputs.cache-hit != 'true'
         run: make install-dev
 
       - name: check formatting
@@ -80,15 +72,7 @@ jobs:
           version: ${{ env.UV_VERSION }}
           enable-cache: true
 
-      - name: Load cached venv
-        id: cached-venv
-        uses: actions/cache@v4
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/uv.lock') }}
-
       - name: Install dependencies
-        if: steps.cached-venv.outputs.cache-hit != 'true'
         run: make install-dev
 
       - name: lint code
@@ -116,15 +100,7 @@ jobs:
           version: ${{ env.UV_VERSION }}
           enable-cache: true
 
-      - name: Load cached venv
-        id: cached-venv
-        uses: actions/cache@v4
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/pyproject.toml') }}-${{ hashFiles('**/uv.lock') }}
-
       - name: Install dependencies
-        if: steps.cached-venv.outputs.cache-hit != 'true'
         run: make install-dev
 
       - name: type-check code
@@ -144,4 +120,3 @@ jobs:
         uses: re-actors/alls-green@release/v1
         with:
           jobs: ${{ toJSON(needs) }}
-          allowed-failures: upload-coverage
diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml
@@ -48,7 +48,7 @@ jobs:
         run: uv lock
 
       - name: uv sync --dev
-        run: uv sync --dev
+        run: uv sync --dev --all-packages --all-extras
 
       - name: make test
         run: make test
@@ -85,7 +85,7 @@ jobs:
 
       - name: uv sync --dev --upgrade
         if: hashFiles('uv.lock') != ''
-        run: uv sync --dev --upgrade
+        run: uv sync --dev --upgrade --all-packages --all-extras
 
       - name: make test
         if: hashFiles('uv.lock') != ''

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -48,26 +48,20 @@ jobs:
         with:
           submodules: true
 
+      - name: Set up uv
+        uses: astral-sh/setup-uv@v3
+        with:
+          version: ${{ env.UV_VERSION }}
+          enable-cache: true
+
       - name: Set up Python ${{ matrix.python-version }}
         id: setup-python
         uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Set up uv
-        run: curl -LsSf https://astral.sh/uv/${{ env.UV_VERSION }}/install.sh | sh
-
-      - name: Restore uv cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.UV_CACHE_DIR }}
-          key: uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
-          restore-keys: |
-            uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
-            uv-${{ runner.os }}
-
       - name: Install dependencies
-        run: uv sync --all-extras --all-packages --dev
+        run: make install-dev
 
       - name: Run tests for coverage
         run: make test-w-coverage cov_report=xml