Skip to content

Commit

Permalink
feat(ci): remove unused Docker build step, fix pnpm setup
Browse files Browse the repository at this point in the history
  • Loading branch information
jkomyno committed Sep 16, 2024
1 parent c9bf222 commit 71c9d7d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 32 deletions.
42 changes: 11 additions & 31 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"typescript": "^5.6.0",
"vitest": "^2.1.0"
},
"packageManager": "[email protected].0",
"packageManager": "[email protected].8",
"pre-commit": "lint-staged",
"lint-staged": {
"*.{js,ts,cjs,mjs,md,json,jsonc}": "biome ci --no-errors-on-unmatched"
Expand Down

0 comments on commit 71c9d7d

Please sign in to comment.