From 01f8787d7c41048421b5ff06daafe0dfcd97fba6 Mon Sep 17 00:00:00 2001 From: w0rp Date: Sun, 20 Jul 2025 12:52:23 +0100 Subject: [PATCH] Simplify CI/CD steps --- .github/workflows/cd.yml | 2 +- .github/workflows/ci.yml | 12 +++++++++++- .github/workflows/lint.yml | 18 ------------------ 3 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 .github/workflows/lint.yml diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 34ebcc5..ccae74a 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -17,7 +17,7 @@ on: jobs: lint: - uses: ./.github/workflows/lint.yml + uses: ./.github/workflows/ci.yml deploy: runs-on: ubuntu-latest needs: lint diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a323f9..900d1cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,8 +2,18 @@ name: Lint on: + workflow_call: pull_request: jobs: lint: - uses: ./.github/workflows/lint.yml + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 18 + cache: 'npm' + - run: npm ci + - run: npm run lint + - run: npm run tsc diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index 8765fa1..0000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Lint - -on: - workflow_call: - -jobs: - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 18 - cache: 'npm' - - run: npm ci - - run: npm run lint - - run: npm run tsc