From fa91452013384574c398f373b5a840549e364ea1 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 23 Sep 2024 23:10:20 -0300 Subject: [PATCH 1/2] chore: bump turbo --- .github/workflows/cd.yml | 1 + .github/workflows/ci-pr.yml | 1 + package.json | 2 +- turbo.json | 2 +- yarn.lock | 60 ++++++++++++++++++------------------- 5 files changed, 34 insertions(+), 32 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index c372e45e71..f7bf7255d0 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -22,6 +22,7 @@ jobs: with: node-version: "22.2.0" cache: "yarn" + - uses: rharkor/caching-for-turbo@v1.5 - uses: actions/cache@v3 id: yarn-cache with: diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 8ca41a60e1..5f295beb06 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -31,6 +31,7 @@ jobs: **/node_modules .yarn/cache key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }} + - uses: rharkor/caching-for-turbo@v1.5 - name: Turbo Cache id: turbo-cache uses: actions/cache@v3 diff --git a/package.json b/package.json index 1b8e78e695..22208d18c1 100644 --- a/package.json +++ b/package.json @@ -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" }, diff --git a/turbo.json b/turbo.json index d0127b9a90..f1f856338c 100644 --- a/turbo.json +++ b/turbo.json @@ -16,7 +16,7 @@ "dependsOn": ["build"] }, "build-storybook": { - "dependsOn": ["^build"], + "dependsOn": ["build", "^build"], "outputs": ["storybook-static/**"] } } diff --git a/yarn.lock b/yarn.lock index 87f850ce9c..9f66f3568b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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 @@ -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 @@ -21336,7 +21336,7 @@ __metadata: optional: true bin: turbo: bin/turbo - checksum: 10/c00a0f5c33388055f1e4586738415e6ddb7689ace1fec1cc97766c058c62498b2a4d64b553c22768e5d7e53be9b40c5b663b4bcc388ee75f6e130445b5512fbc + checksum: 10/8dea62fa29ff9ca6fc56b19c1558d2b2bf628e71de109bcd82374e2d745d2f825559c54f9c56d60449f4ddbb2b2d5e2d064a9d814474a7b72e058d6236f85703 languageName: node linkType: hard From 3b945f987219461c4b832a8507a18bf658ae6221 Mon Sep 17 00:00:00 2001 From: Guilherme Gazzo Date: Mon, 23 Sep 2024 23:21:18 -0300 Subject: [PATCH 2/2] remove useless cache step --- .github/workflows/cd.yml | 24 ++++++------------------ .github/workflows/ci-pr.yml | 10 ++-------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index f7bf7255d0..436150eb81 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -18,20 +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: rharkor/caching-for-turbo@v1.5 - - uses: actions/cache@v3 - id: yarn-cache - with: - path: | - **/node_modules - .yarn/cache - key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }} - 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 @@ -65,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 diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index 5f295beb06..6977d172e7 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -21,16 +21,10 @@ 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/caching-for-turbo@v1.5 - name: Turbo Cache id: turbo-cache @@ -41,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: