Skip to content

Commit

Permalink
Merge pull request #2955 from online-go/yarn
Browse files Browse the repository at this point in the history
Switch back to yarn
  • Loading branch information
anoek authored Feb 14, 2025
2 parents d612c3c + babf8d8 commit 9ea89f5
Show file tree
Hide file tree
Showing 9 changed files with 11,018 additions and 20,013 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
path: node_modules
key: ${{ runner.os }}-node-modules

- name: npm clean-install
- name: yarn install
uses: nick-fields/retry@v3
with:
timeout_minutes: 10
max_attempts: 3
command: npm clean-install
command: yarn install

- name: Eslint
run: npm run lint
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Makefile.passwords
how_to_add_a_new_language.txt
.DS_Store
/.alm/
yarn.lock
package-lock.json
report.*.json
neovide_backtraces.log

Expand Down
2 changes: 1 addition & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
package-lock=true
package-lock=false
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ or your fork with the `--recurse-submodules` flag and perform the following acti

```
# First install the necessary dependencies
npm clean-install
npx yarn install
# Next install `husky`, this provides pre-commit checks to ensure the code
# meets some basic guidelines
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ WORKDIR /usr/src/app

# Install app dependencies
COPY package.json /usr/src/app/
RUN npm clean-install
RUN yarn install

# Bundle app source
COPY . /usr/src/app
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ local-dev: node_modules .husky
npx husky install

node_modules: package.json
npm clean-install
npm ls yarn || npm install yarn
npm run yarn install

pretty prettier lint-fix:
npm run prettier
Expand Down
Loading

0 comments on commit 9ea89f5

Please sign in to comment.