From aaf9d41318ab413a4599d0adaebbba4dd5daf09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Sj=C3=B6kvist?= Date: Tue, 8 Oct 2024 20:18:24 +0200 Subject: [PATCH] fix: improve ci pipeline * fix: working directory in ts workflow * fix: tsc cmd * fix: update ts-lint action versions * fix: working-directory in dependabot bun action --- .github/workflows/dependabot-bun.yml | 7 +++++-- .github/workflows/ts-lint.yml | 11 +++++++---- gui/package.json | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dependabot-bun.yml b/.github/workflows/dependabot-bun.yml index 3d20a03..9ae1bee 100644 --- a/.github/workflows/dependabot-bun.yml +++ b/.github/workflows/dependabot-bun.yml @@ -13,6 +13,9 @@ jobs: name: "Update bun.lockb" if: github.actor == 'dependabot[bot]' runs-on: ubuntu-latest + defaults: + run: + working-directory: ./gui steps: - uses: oven-sh/setup-bun@v1 - uses: actions/checkout@v4 @@ -20,8 +23,8 @@ jobs: fetch-depth: 0 ref: ${{ github.event.pull_request.head.ref }} - run: | - bun install --cwd gui - git add gui/bun.lockb + bun install + git add bun.lockb git config --global user.name 'dependabot[bot]' git config --global user.email 'dependabot[bot]@users.noreply.github.com' git commit --amend --no-edit diff --git a/.github/workflows/ts-lint.yml b/.github/workflows/ts-lint.yml index eb4b133..74a187b 100644 --- a/.github/workflows/ts-lint.yml +++ b/.github/workflows/ts-lint.yml @@ -7,13 +7,16 @@ on: jobs: ts-lint: runs-on: ubuntu-latest + defaults: + run: + working-directory: ./gui steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: oven-sh/setup-bun@v1 - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: - path: ~/gui/node_modules - key: ${{ runner.os }}-${{ hashFiles('./gui/bun.lockb') }} + path: node_modules + key: ${{ runner.os }}-${{ hashFiles('bun.lockb') }} if: steps.cache-deps.outputs.cache-hit != 'true' - run: bun install if: steps.cache-deps.outputs.cache-hit != 'true' diff --git a/gui/package.json b/gui/package.json index 7e55c3c..5f0d34a 100644 --- a/gui/package.json +++ b/gui/package.json @@ -6,7 +6,7 @@ "build": "vite build --config .config/vite.config.js", "format": "prettier src --config .config/prettier.config.js --write", "format:check": "prettier --config .config/prettier.config.js src --check", - "tsc": "tsc --project .config/tsconfig.json --noEmit", + "tsc": "tsc --project . --noEmit", "dev": "vite --config .config/vite.config.js" }, "dependencies": {