diff --git a/.github/workflows/lint.yml b/.github/workflows/ci.yml similarity index 77% rename from .github/workflows/lint.yml rename to .github/workflows/ci.yml index fc57e4e..79a0152 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/ci.yml @@ -2,18 +2,16 @@ name: CI on: push: + branches: + - canary pull_request: concurrency: - group: ${{ github.workflow }}-${{ github.event.number || github.sha }} + group: '${{ github.workflow }}-${{ github.event.number || github.sha }}' cancel-in-progress: true -permissions: - contents: read - packages: write - jobs: - check: + lint: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -25,10 +23,11 @@ jobs: node-version: 20 cache: 'pnpm' - - run: pnpm install -C web - - run: pnpm run -C web check:format + - run: pnpm -r install --frozen-lockfile + - run: pnpm --if-present format:check + - run: pnpm --if-present lint - ghcr-build: + image: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.prettierignore b/.prettierignore index a254912..bce12ff 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,7 +1,7 @@ .DS_Store node_modules /build -.svelte-kit +web /package .env .env.* diff --git a/package.json b/package.json index 9612b69..75ebee0 100644 --- a/package.json +++ b/package.json @@ -11,8 +11,8 @@ "start": "pnpm docker:drop && docker compose -f docker-compose.yml up", "docker:build": "docker buildx build --tag wireadmin .", "docker:drop": "docker compose rm -fsv", - "format": "prettier --write . && pnpm -r format", - "format:check": "prettier --check . && pnpm -r format:check" + "format": "prettier --write . && pnpm --if-present -r format", + "format:check": "prettier --check . && pnpm --if-present -r format:check" }, "keywords": [], "license": "GPL-3.0",