From 71c9d7d0c2a42de19549774a397b6afe46621e5c Mon Sep 17 00:00:00 2001 From: jkomyno Date: Mon, 16 Sep 2024 12:36:15 +0200 Subject: [PATCH] feat(ci): remove unused Docker build step, fix pnpm setup --- .github/workflows/ci.yaml | 42 ++++++++++----------------------------- package.json | 2 +- 2 files changed, 12 insertions(+), 32 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index befe976..24b52c5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,37 +19,6 @@ permissions: pull-requests: read jobs: - docker: - runs-on: ${{ matrix.os }} - - strategy: - matrix: - os: [ubuntu-latest] - node: ['20.9.0'] - - name: "Docker: ${{ matrix.os }}" - - env: - DOCKER_BUILDKIT: 1 - COMPOSE_DOCKER_CLI_BUILD: 1 - CI: 1 - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - name: Cache pnpm modules - uses: actions/cache@v4 - with: - path: ~/.pnpm-store - key: ${{ runner.os }}-${{ matrix.node }}-node-${{ hashFiles('**/pnpm-lock.yaml') }} - restore-keys: | - ${{ runner.os }}-${{ matrix.node }}-node- - - - name: Build Docker pnpm image - run: docker buildx build -f Dockerfile.pnpm --build-arg NODE_VERSION="${{ matrix.node }}" ./packages -t pnpm - build: runs-on: ${{ matrix.os }} @@ -69,6 +38,17 @@ jobs: - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + node-version: 20 + + - uses: pnpm/action-setup@v4 + with: + version: 8.15.8 + run_install: false + standalone: true + dest: ~/setup-pnpm + - name: Cache pnpm modules uses: actions/cache@v4 with: diff --git a/package.json b/package.json index b308a92..88e2c9d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "typescript": "^5.6.0", "vitest": "^2.1.0" }, - "packageManager": "pnpm@8.15.0", + "packageManager": "pnpm@8.15.8", "pre-commit": "lint-staged", "lint-staged": { "*.{js,ts,cjs,mjs,md,json,jsonc}": "biome ci --no-errors-on-unmatched"