Skip to content

Commit

Permalink
build: use yarn from corepack (#233)
Browse files Browse the repository at this point in the history
* build: use yarn from `corepack`

Follow-up for #215
  • Loading branch information
nekowinston authored Nov 30, 2023
1 parent 832dbda commit 7d8d7ca
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 909 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
with:
fetch-depth: 0

- run: corepack enable

- uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn

- run: corepack enable

- run: yarn install --immutable

- run: yarn build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jobs:
steps:
- uses: actions/checkout@v4

- run: corepack enable

- uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn

- run: corepack enable

- run: yarn install --immutable

- run: yarn lint
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ jobs:
steps:
- uses: actions/checkout@v4

- run: corepack enable

- uses: actions/setup-node@v4
with:
node-version: 18
cache: yarn

- run: corepack enable

- run: yarn install --immutable

- name: Build VSCode
Expand Down
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ themes/
.eslintcache
*.vsix

# yarn v3
# yarn v4
.yarn-error.log
.yarn/*
!.yarn/releases
!.yarn/plugins
!.yarn/sdks
!.yarn/versions
.pnp.*
.pnp.*
893 changes: 0 additions & 893 deletions .yarn/releases/yarn-4.0.2.cjs

This file was deleted.

2 changes: 0 additions & 2 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@ plugins:
# yarn-plugin-nixify options
generateDefaultNix: false
nixExprPath: nix/yarn-project.nix

yarnPath: .yarn/releases/yarn-4.0.2.cjs
10 changes: 6 additions & 4 deletions nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
nodejs = pkgs.nodejs_18;
in
pkgs.mkShell {
buildInputs = [
buildInputs = with pkgs; [
alejandra
nil

nodejs
(pkgs.yarn.override {inherit nodejs;})
pkgs.alejandra
pkgs.nil
corepack
(yarn.override {inherit nodejs;})
];
}
5 changes: 4 additions & 1 deletion nix/yarn-project.nix

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7d8d7ca

Please sign in to comment.