wip

geigerzaehler · Sep 11, 2024 · 1f7670d · 1f7670d
1 parent 353b62c
commit 1f7670d
Showing 1 changed file with 9 additions and 23 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -17,25 +17,18 @@ jobs:
 
     runs-on: ubuntu-latest
     continue-on-error: ${{ matrix.python-version == '3.13-dev' }}
-    env:
-      UV_PYTHON: ${{ matrix.python-version }}
 
     steps:
       - run: sudo apt-get install flac mp3val oggz-tools
       - uses: actions/checkout@v4
-      - name: Set up uv
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh
-      - name: uv cache
-        uses: actions/cache@v4
+      - uses: astral-sh/setup-uv@v2
         with:
-          path: ${{ env.UV_CACHE_DIR}}
-          key: uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
-          restore-keys: |
-            uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
-            uv-${{ runner.os }}
+          enable-cache: true
       - uses: actions/setup-python@v5
+        id: setup-python
         with:
           python-version: ${{ matrix.python-version }}
+      - run: echo "UV_PYTHON=${{ steps.setup-python.outputs.python-path }}" >> $GITHUB_ENV
       - run: uv lock --locked
       - run: uv sync --all-extras --dev
       - run: uv run ruff check .
@@ -50,25 +43,18 @@ jobs:
           - "beets==1.6.1"
 
     runs-on: ubuntu-latest
-    env:
-      UV_PYTHON: "3.9"
 
     steps:
       - run: sudo apt-get install flac mp3val oggz-tools
       - uses: actions/checkout@v4
-      - name: Set up uv
-        run: curl -LsSf https://astral.sh/uv/install.sh | sh
-      - name: uv cache
-        uses: actions/cache@v4
+      - uses: astral-sh/setup-uv@v2
         with:
-          path: ${{ env.UV_CACHE_DIR}}
-          key: uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
-          restore-keys: |
-            uv-${{ runner.os }}-${{ hashFiles('uv.lock') }}
-            uv-${{ runner.os }}
+          enable-cache: true
       - uses: actions/setup-python@v5
+        id: setup-python
         with:
-          python-version: ${{ env.UV_PYTHON }}
+          python-version: ${{ matrix.python-version }}
+      - run: echo "UV_PYTHON=${{ steps.setup-python.outputs.python-path }}" >> $GITHUB_ENV
       - run: uv lock -P ${{ matrix.beets }}
       - run: uv sync --all-extras --dev
       - run: uv run pytest