Skip to content
This repository has been archived by the owner on Apr 28, 2023. It is now read-only.

Commit

Permalink
Merge pull request #204 from metmuseum/remove-pnpm-hack
Browse files Browse the repository at this point in the history
Remove pnpm hack
  • Loading branch information
stephenhmarsh committed Sep 29, 2022
2 parents f6add98 + 7dec7e2 commit 89eb0fd
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,17 @@ jobs:
steps:
- checkout
- run: node --version
- run: npm --version
- run: npm i --prefix=./tmp --global pnpm # hack to install pnpm with npm until https://github.com/CircleCI-Public/cimg-node/issues/216
- run: ./tmp/bin/pnpm --version
- run: pnpm --version
- restore_cache:
keys:
- pnpm-cache-{{ checksum "pnpm-lock.yaml" }}
- run: ./tmp/bin/pnpm install --frozen-lockfile
- run: pnpm install --frozen-lockfile
- save_cache:
key: pnpm-cache-{{ checksum "pnpm-lock.yaml" }}
paths:
- /home/circleci/.local/share/pnpm/store/v3
- run: ./tmp/bin/pnpm run lint
- run: ./tmp/bin/pnpm run stylelint
- run: pnpm run lint
- run: pnpm run stylelint
- persist_to_workspace:
root: .
paths:
Expand All @@ -34,7 +32,7 @@ jobs:
at: .
- run:
name: "Build static storybook to ./.out"
command: ./tmp/bin/pnpm run build-storybook
command: pnpm run build-storybook
- persist_to_workspace:
root: .
paths:
Expand All @@ -47,7 +45,7 @@ jobs:
at: .
- run:
name: "Run Chromatic"
command: ./tmp/bin/pnpm run chromatic-ci
command: pnpm run chromatic-ci
build_and_deploy_dist:
executor: marble-node
steps:
Expand All @@ -59,10 +57,10 @@ jobs:
- "50:f8:e7:4b:75:10:ff:83:d3:dc:ca:77:7b:f7:72:8a"
- run:
name: "Build Marble's ./dist for production!"
command: ./tmp/bin/pnpm run build
command: pnpm run build
- run: git config user.email "stephen.marsh@metmuseum.org"
- run: git config user.name "Marble Bot"
- run: ./tmp/bin/pnpm run build
- run: pnpm run build
- run: node ./.circleci/scripts/git_steps_for_dist_build.js
- persist_to_workspace:
root: .
Expand All @@ -81,7 +79,7 @@ jobs:
- run: git config user.name "Marble Bot"
- run:
name: "Use release-it to tag and push to GitHub as release"
command: DEBUG=release-it:* ./tmp/bin/pnpm run release patch --ci -VV --no-git.requireUpstream --set-upstream origin main
command: DEBUG=release-it:* pnpm run release patch --ci -VV --no-git.requireUpstream --set-upstream origin main

workflows:
build__do_chromatic__build_and_deploy_dist__tag_a_release:
Expand Down

0 comments on commit 89eb0fd

Please sign in to comment.