Skip to content

Commit

Permalink
switch back to yarn 1
Browse files Browse the repository at this point in the history
  • Loading branch information
Connoropolous committed Oct 26, 2023
1 parent 8242e33 commit 7817981
Show file tree
Hide file tree
Showing 7 changed files with 13,404 additions and 18,566 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dry-run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
- uses: actions/setup-node@v3
with:
node-version: 20
cache: 'yarn'
- name: Windows only, install wget
if: ${{ runner.os == 'Windows' }}
run: |
choco install wget --no-progress
- name: Run install
uses: borales/actions-yarn@v4
with:
cmd: install # will run `yarn install` command
run: |
yarn install
- name: setup for codesigning (macos only)
if: ${{ runner.os == 'macOs' }}
uses: figleafteam/import-codesign-certs@v2
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,17 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 20
cache: 'yarn'
- name: Windows only, install wget
if: ${{ runner.os == 'Windows' }}
run: |
choco install wget --no-progress
- name: Run install
uses: borales/actions-yarn@v4
with:
cmd: install # will run `yarn install` command
run: |
yarn install
- name: setup for codesigning (macos only)
if: ${{ runner.os == 'macOs' }}
uses: figleafteam/import-codesign-certs@v2
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run install
uses: borales/actions-yarn@v4
- uses: actions/setup-node@v3
with:
cmd: install # will run `yarn install` command
node-version: 20
cache: 'yarn'
- name: Run install
run: |
yarn install
- name: Storybook static build
run: |
yarn workspace acorn-ui build-storybook
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- name: Run install
uses: borales/actions-yarn@v4
- uses: actions/setup-node@v3
with:
cmd: install # will run `yarn install` command
node-version: 20
cache: 'yarn'
- name: Run install
run: |
yarn install
- name: Build zod-models dependency
run: |
yarn workspace zod-models build
Expand Down
3 changes: 0 additions & 3 deletions electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
"email": "[email protected]"
},
"license": "CAL-1.0",
"installConfig": {
"hoistingLimits": "workspaces"
},
"build": {
"productName": "Acorn",
"afterSign": "./afterSignHook.js",
Expand Down
17 changes: 10 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
{
"name": "acorn-workspace",
"packageManager": "yarn@4.0.0",
"packageManager": "yarn@1.22.19",
"version": "9.5.1-alpha",
"private": true,
"workspaces": [
"electron",
"web",
"zod-models"
],
"workspaces": {
"packages": [
"electron",
"web",
"zod-models"
],
"nohoist": ["**/electron-builder", "**/electron-builder/**"]
},
"description": "Acorn is software that helps people create the future",
"repository": {
"type": "git",
Expand Down Expand Up @@ -38,4 +41,4 @@
"devDependencies": {
"typescript": "^5.1.6"
}
}
}
Loading

0 comments on commit 7817981

Please sign in to comment.