Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump turbo #1451

Merged
merged 2 commits into from
Sep 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 7 additions & 18 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,14 @@ jobs:
branch-name: ${{ steps.set-branch-name.outputs.branch-name }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
id: setup-node
with:
node-version: "22.2.0"
cache: "yarn"
- uses: actions/cache@v3
id: yarn-cache
with:
path: |
**/node_modules
.yarn/cache
key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
- uses: rharkor/[email protected]
- run: yarn install
if: steps.yarn-cache.outputs.cache-hit != 'true'
if: steps.setup-node.outputs.cache-hit != 'true'
- run: yarn run ci
- run: yarn run docs
- uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -64,25 +59,19 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
id: setup-node
with:
node-version: "22.2.0"
registry-url: "https://registry.npmjs.org"
scope: "@rocket.chat"
cache: "yarn"
- uses: actions/cache@v3
id: yarn-cache
with:
path: |
**/node_modules
.yarn/cache
key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
- uses: actions/download-artifact@v3
with:
name: build
path: packages
- run: yarn install
if: steps.yarn-cache.outputs.cache-hit != 'true'
if: steps.setup-node.outputs.cache-hit != 'true'

- name: Create Release Pull Request
id: changesets
Expand Down
11 changes: 3 additions & 8 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,11 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v4
id: setup-node
with:
node-version: "22.2.0"
cache: "yarn"
- uses: actions/cache@v3
id: yarn-cache
with:
path: |
**/node_modules
.yarn/cache
key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
- uses: rharkor/[email protected]
- name: Turbo Cache
id: turbo-cache
uses: actions/cache@v3
Expand All @@ -40,7 +35,7 @@ jobs:
restore-keys: |
turbo-${{ runner.os }}-
- run: yarn install
if: steps.yarn-cache.outputs.cache-hit != 'true'
if: steps.setup-node.outputs.cache-hit != 'true'
- run: yarn run ci
- uses: actions/upload-artifact@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"husky": "~9.0.11",
"hygen": "~6.1.5",
"pinst": "~3.0.0",
"turbo": "~2.0.11",
"turbo": "~2.1.2",
"update-readme": "workspace:~",
"webpack": "~5.78.0"
},
Expand Down
2 changes: 1 addition & 1 deletion turbo.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"dependsOn": ["build"]
},
"build-storybook": {
"dependsOn": ["^build"],
"dependsOn": ["build", "^build"],
"outputs": ["storybook-static/**"]
}
}
Expand Down
60 changes: 30 additions & 30 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4536,7 +4536,7 @@ __metadata:
husky: "npm:~9.0.11"
hygen: "npm:~6.1.5"
pinst: "npm:~3.0.0"
turbo: "npm:~2.0.11"
turbo: "npm:~2.1.2"
update-readme: "workspace:~"
webpack: "npm:~5.78.0"
languageName: unknown
Expand Down Expand Up @@ -21269,58 +21269,58 @@ __metadata:
languageName: node
linkType: hard

"turbo-darwin-64@npm:2.0.11":
version: 2.0.11
resolution: "turbo-darwin-64@npm:2.0.11"
"turbo-darwin-64@npm:2.1.2":
version: 2.1.2
resolution: "turbo-darwin-64@npm:2.1.2"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"turbo-darwin-arm64@npm:2.0.11":
version: 2.0.11
resolution: "turbo-darwin-arm64@npm:2.0.11"
"turbo-darwin-arm64@npm:2.1.2":
version: 2.1.2
resolution: "turbo-darwin-arm64@npm:2.1.2"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"turbo-linux-64@npm:2.0.11":
version: 2.0.11
resolution: "turbo-linux-64@npm:2.0.11"
"turbo-linux-64@npm:2.1.2":
version: 2.1.2
resolution: "turbo-linux-64@npm:2.1.2"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard

"turbo-linux-arm64@npm:2.0.11":
version: 2.0.11
resolution: "turbo-linux-arm64@npm:2.0.11"
"turbo-linux-arm64@npm:2.1.2":
version: 2.1.2
resolution: "turbo-linux-arm64@npm:2.1.2"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard

"turbo-windows-64@npm:2.0.11":
version: 2.0.11
resolution: "turbo-windows-64@npm:2.0.11"
"turbo-windows-64@npm:2.1.2":
version: 2.1.2
resolution: "turbo-windows-64@npm:2.1.2"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"turbo-windows-arm64@npm:2.0.11":
version: 2.0.11
resolution: "turbo-windows-arm64@npm:2.0.11"
"turbo-windows-arm64@npm:2.1.2":
version: 2.1.2
resolution: "turbo-windows-arm64@npm:2.1.2"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"turbo@npm:~2.0.11":
version: 2.0.11
resolution: "turbo@npm:2.0.11"
dependencies:
turbo-darwin-64: "npm:2.0.11"
turbo-darwin-arm64: "npm:2.0.11"
turbo-linux-64: "npm:2.0.11"
turbo-linux-arm64: "npm:2.0.11"
turbo-windows-64: "npm:2.0.11"
turbo-windows-arm64: "npm:2.0.11"
"turbo@npm:~2.1.2":
version: 2.1.2
resolution: "turbo@npm:2.1.2"
dependencies:
turbo-darwin-64: "npm:2.1.2"
turbo-darwin-arm64: "npm:2.1.2"
turbo-linux-64: "npm:2.1.2"
turbo-linux-arm64: "npm:2.1.2"
turbo-windows-64: "npm:2.1.2"
turbo-windows-arm64: "npm:2.1.2"
dependenciesMeta:
turbo-darwin-64:
optional: true
Expand All @@ -21336,7 +21336,7 @@ __metadata:
optional: true
bin:
turbo: bin/turbo
checksum: 10/c00a0f5c33388055f1e4586738415e6ddb7689ace1fec1cc97766c058c62498b2a4d64b553c22768e5d7e53be9b40c5b663b4bcc388ee75f6e130445b5512fbc
checksum: 10/8dea62fa29ff9ca6fc56b19c1558d2b2bf628e71de109bcd82374e2d745d2f825559c54f9c56d60449f4ddbb2b2d5e2d064a9d814474a7b72e058d6236f85703
languageName: node
linkType: hard

Expand Down
Loading