From 1a5c413464275d51b7237cddedcdca7482abb589 Mon Sep 17 00:00:00 2001 From: Andras Schmelczer Date: Tue, 24 Mar 2026 19:30:35 +0000 Subject: [PATCH] Fix CI --- .forgejo/workflows/ci.yml | 13 +++---------- .forgejo/workflows/docker-publish.yml | 14 +++++++------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index c333373..a45750b 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -17,9 +17,8 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: astral-sh/setup-uv@v4 - with: - enable-cache: true + - name: Install uv + run: curl -LsSf https://astral.sh/uv/install.sh | sh - name: Install dependencies run: uv sync @@ -48,8 +47,6 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 22 - cache: npm - cache-dependency-path: frontend/package-lock.json - name: Install dependencies run: npm ci @@ -72,11 +69,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable - - - uses: Swatinem/rust-cache@v2 - with: - workspaces: server-rs + - uses: https://github.com/dtolnay/rust-toolchain@stable - name: Clippy run: cargo clippy -- -D warnings diff --git a/.forgejo/workflows/docker-publish.yml b/.forgejo/workflows/docker-publish.yml index a53ccc2..365476a 100644 --- a/.forgejo/workflows/docker-publish.yml +++ b/.forgejo/workflows/docker-publish.yml @@ -17,8 +17,8 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up uv - uses: astral-sh/setup-uv@v4 + - name: Install uv + run: curl -LsSf https://astral.sh/uv/install.sh | sh - name: Download map assets (fonts, sprites, twemoji) run: uv run python -m pipeline.download.map_assets --output frontend/public/assets @@ -27,10 +27,10 @@ jobs: run: uv run python -m pipeline.download.arcgis --output property-data/arcgis_data.parquet - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + uses: https://github.com/docker/setup-buildx-action@v3 - name: Log in to Forgejo Container Registry - uses: docker/login-action@v3 + uses: https://github.com/docker/login-action@v3 with: registry: ${{ env.REGISTRY }} username: ${{ gitea.actor }} @@ -62,7 +62,7 @@ jobs: echo "sha_short=${SHA_SHORT}" >> "$GITHUB_OUTPUT" - name: Build and push - uses: docker/build-push-action@v6 + uses: https://github.com/docker/build-push-action@v6 with: context: . push: true @@ -71,7 +71,7 @@ jobs: cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ steps.tags.outputs.repo }}:buildcache,mode=max - name: Build and push screenshot service - uses: docker/build-push-action@v6 + uses: https://github.com/docker/build-push-action@v6 with: context: ./screenshot push: true @@ -82,7 +82,7 @@ jobs: cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ steps.tags.outputs.repo }}-screenshot:buildcache,mode=max - name: Build and push finder service - uses: docker/build-push-action@v6 + uses: https://github.com/docker/build-push-action@v6 with: context: . file: Dockerfile.finder