Skip to content

Commit

Permalink
chore: use Node 18 & Yarn v4 (#468)
Browse files Browse the repository at this point in the history
  • Loading branch information
layershifter authored Nov 23, 2023
1 parent 413bb6f commit fb6f681
Show file tree
Hide file tree
Showing 11 changed files with 8,987 additions and 8,876 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/bundle-size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
bundle-size:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Derive appropriate SHAs for base and head for `nx affected` commands
uses: nrwl/nx-set-shas@v3

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
cache: yarn
node-version: '18'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-change.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ jobs:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'pull_request' }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '18'

- run: npx beachball check --changehint "Run 'yarn change' to generate a change file"
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Derive appropriate SHAs for base and head for `nx affected` commands
uses: nrwl/nx-set-shas@v2

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

- run: yarn install --immutable
- run: yarn check-dependencies
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
if: ${{ contains(github.event.head_commit.message, 'applying package updates') || github.event_name == 'workflow_dispatch' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- run: yarn install --immutable
- run: yarn nx run-many --target=build --projects=@griffel/website --parallel --max-parallel=3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
status: ${{ steps.verify-extension-changed.outputs.any_changed }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Verify extension has changed
uses: tj-actions/[email protected]
Expand All @@ -32,12 +32,12 @@ jobs:
if: ${{ needs.check.outputs.status == 'true' || github.event_name == 'workflow_dispatch' }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

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

- run: yarn install --immutable
- run: yarn nx run-many --target=build --projects=@griffel/devtools --parallel --max-parallel=3
Expand Down
786 changes: 0 additions & 786 deletions .yarn/releases/yarn-3.2.1.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.1.cjs
yarnPath: .yarn/releases/yarn-4.0.2.cjs
10 changes: 5 additions & 5 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ extends:
- script: |
echo "##vso[task.setvariable variable=shellopts]braceexpand:hashall:interactive-comments:errexit:errtrace"
displayName: Force exit on error (bash)
- task: NodeTool@0
inputs:
versionSpec: '16.x'
versionSpec: '18.x'
checkLatest: true
displayName: 'Install Node.js'

- script: yarn install --frozen-lockfile
displayName: Install dependencies

- script: |
git config user.name "Fluent UI Build"
git config user.email "[email protected]"
git remote set-url origin https://$(githubUser):$(githubPAT)@github.com/microsoft/griffel.git
displayName: Authenticate git for pushes
- script: |
yarn beachball publish -b origin/main --access public -y -n $(npmToken)
git reset --hard origin/main
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "git",
"url": "https://github.com/microsoft/griffel"
},
"packageManager": "yarn@3.1.1",
"packageManager": "yarn@4.0.2",
"nano-staged": {
"**/*.{js,json,ts,tsx}": "prettier --write",
"**/*.{md}": "doctoc -u"
Expand Down
Loading

0 comments on commit fb6f681

Please sign in to comment.