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 #1453

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
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
24 changes: 6 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'

- run: yarn run ci
- run: yarn run docs
- uses: actions/upload-artifact@v3
Expand Down Expand Up @@ -64,25 +59,18 @@ 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'

- name: Create Release Pull Request
id: changesets
Expand Down
18 changes: 2 additions & 16 deletions .github/workflows/ci-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,12 @@ 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') }}
- name: Turbo Cache
id: turbo-cache
uses: actions/cache@v3
with:
path: .turbo
key: turbo-${{ runner.os }}-${{ github.job }}
restore-keys: |
turbo-${{ runner.os }}-
- uses: rharkor/[email protected]
- run: yarn install
if: steps.yarn-cache.outputs.cache-hit != 'true'
- run: yarn run ci
- uses: actions/upload-artifact@v3
with:
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
58 changes: 29 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4959,7 +4959,7 @@ __metadata:
lint-all: "workspace:~"
prettier: "npm:~2.8.7"
peerDependencies:
prettier: ~2.7.1
prettier: "*"
languageName: unknown
linkType: soft

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.0.14":
version: 2.0.14
resolution: "turbo-darwin-64@npm:2.0.14"
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.0.14":
version: 2.0.14
resolution: "turbo-darwin-arm64@npm:2.0.14"
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.0.14":
version: 2.0.14
resolution: "turbo-linux-64@npm:2.0.14"
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.0.14":
version: 2.0.14
resolution: "turbo-linux-arm64@npm:2.0.14"
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.0.14":
version: 2.0.14
resolution: "turbo-windows-64@npm:2.0.14"
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.0.14":
version: 2.0.14
resolution: "turbo-windows-arm64@npm:2.0.14"
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"
version: 2.0.14
resolution: "turbo@npm:2.0.14"
dependencies:
turbo-darwin-64: "npm:2.0.14"
turbo-darwin-arm64: "npm:2.0.14"
turbo-linux-64: "npm:2.0.14"
turbo-linux-arm64: "npm:2.0.14"
turbo-windows-64: "npm:2.0.14"
turbo-windows-arm64: "npm:2.0.14"
dependenciesMeta:
turbo-darwin-64:
optional: true
Expand All @@ -21336,7 +21336,7 @@ __metadata:
optional: true
bin:
turbo: bin/turbo
checksum: 10/c00a0f5c33388055f1e4586738415e6ddb7689ace1fec1cc97766c058c62498b2a4d64b553c22768e5d7e53be9b40c5b663b4bcc388ee75f6e130445b5512fbc
checksum: 10/8702de17bb7a05c9feed56eef76acdde5e2161a72647c0bf22b602e0e5004e4908bca7f58aa727b386af0869e516d424e363d6fe97dd562d297b128634a123e0
languageName: node
linkType: hard

Expand Down
Loading