Skip to content

Commit

Permalink
chore: update turbo to v2 (#3186)
Browse files Browse the repository at this point in the history
* chore: update turbo to v2

* Set yarn config just before publish

This prevents .yarnrc failing to source NODE_AUTH_TOKEN when building

This repo is public so there's no need to auth before building deps
  • Loading branch information
sethidden authored Jul 26, 2024
1 parent 11bfada commit b485c2e
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 43 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,17 +214,17 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: yarn --immutable
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Bump package version
run: yarn changeset version --snapshot
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build packages
run: yarn build:release
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Publish canary version
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish --tag canary || true
env:
Expand All @@ -249,16 +249,16 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: yarn --immutable
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Save head commit message
id: commit_message
run: echo "result=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT
- name: Build packages
run: yarn build:release
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Publish release-candidate version
# If this is any `v2-release/**` branch AND last commit is made by changeset action and its commit message is with "ci: release (rc)", this happens only after merging changesets changelog PR
if: "${{ startsWith( github.event.pull_request.head.ref, 'v2-release' ) && contains( steps.commit_message.outputs.result, 'ci: version packages (rc)' ) }}"
Expand Down Expand Up @@ -287,13 +287,13 @@ jobs:
registry-url: 'https://registry.npmjs.org'
- name: Install dependencies
run: yarn --immutable
- name: Build packages
run: yarn build:release
- name: Set yarn config
run: |
yarn config set npmScopes.storefront-ui.npmAuthToken "\${NODE_AUTH_TOKEN}"
yarn config set npmScopes.storefront-ui.npmPublishRegistry 'https://registry.npmjs.org'
yarn config set npmScopes.storefront-ui.npmRegistryServer 'https://registry.npmjs.org'
- name: Build packages
run: yarn build:release
- name: Publish Production version package
run: yarn workspaces foreach --no-private --from '@storefront-ui/*' npm publish || true
env:
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"rimraf": "^5.0.0",
"rollup-plugin-preserve-directives": "^0.4.0",
"tailwindcss": "^3.4.3",
"turbo": "latest",
"turbo": "^2.0.10-canary.1",
"typescript": "^5.4.5",
"unified": "^11.0.4",
"wait-on": "^7.0.1"
Expand Down
2 changes: 1 addition & 1 deletion turbo.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://turborepo.org/schema.json",
"pipeline": {
"tasks": {
"build": {
"cache": false,
"dependsOn": [
Expand Down
58 changes: 29 additions & 29 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4713,7 +4713,7 @@ __metadata:
rimraf: ^5.0.0
rollup-plugin-preserve-directives: ^0.4.0
tailwindcss: ^3.4.3
turbo: latest
turbo: ^2.0.10-canary.1
typescript: ^5.4.5
unified: ^11.0.4
wait-on: ^7.0.1
Expand Down Expand Up @@ -22257,58 +22257,58 @@ __metadata:
languageName: node
linkType: hard

"turbo-darwin-64@npm:1.13.3":
version: 1.13.3
resolution: "turbo-darwin-64@npm:1.13.3"
"turbo-darwin-64@npm:2.0.10-canary.1":
version: 2.0.10-canary.1
resolution: "turbo-darwin-64@npm:2.0.10-canary.1"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"turbo-darwin-arm64@npm:1.13.3":
version: 1.13.3
resolution: "turbo-darwin-arm64@npm:1.13.3"
"turbo-darwin-arm64@npm:2.0.10-canary.1":
version: 2.0.10-canary.1
resolution: "turbo-darwin-arm64@npm:2.0.10-canary.1"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"turbo-linux-64@npm:1.13.3":
version: 1.13.3
resolution: "turbo-linux-64@npm:1.13.3"
"turbo-linux-64@npm:2.0.10-canary.1":
version: 2.0.10-canary.1
resolution: "turbo-linux-64@npm:2.0.10-canary.1"
conditions: os=linux & cpu=x64
languageName: node
linkType: hard

"turbo-linux-arm64@npm:1.13.3":
version: 1.13.3
resolution: "turbo-linux-arm64@npm:1.13.3"
"turbo-linux-arm64@npm:2.0.10-canary.1":
version: 2.0.10-canary.1
resolution: "turbo-linux-arm64@npm:2.0.10-canary.1"
conditions: os=linux & cpu=arm64
languageName: node
linkType: hard

"turbo-windows-64@npm:1.13.3":
version: 1.13.3
resolution: "turbo-windows-64@npm:1.13.3"
"turbo-windows-64@npm:2.0.10-canary.1":
version: 2.0.10-canary.1
resolution: "turbo-windows-64@npm:2.0.10-canary.1"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"turbo-windows-arm64@npm:1.13.3":
version: 1.13.3
resolution: "turbo-windows-arm64@npm:1.13.3"
"turbo-windows-arm64@npm:2.0.10-canary.1":
version: 2.0.10-canary.1
resolution: "turbo-windows-arm64@npm:2.0.10-canary.1"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"turbo@npm:latest":
version: 1.13.3
resolution: "turbo@npm:1.13.3"
"turbo@npm:^2.0.10-canary.1":
version: 2.0.10-canary.1
resolution: "turbo@npm:2.0.10-canary.1"
dependencies:
turbo-darwin-64: 1.13.3
turbo-darwin-arm64: 1.13.3
turbo-linux-64: 1.13.3
turbo-linux-arm64: 1.13.3
turbo-windows-64: 1.13.3
turbo-windows-arm64: 1.13.3
turbo-darwin-64: 2.0.10-canary.1
turbo-darwin-arm64: 2.0.10-canary.1
turbo-linux-64: 2.0.10-canary.1
turbo-linux-arm64: 2.0.10-canary.1
turbo-windows-64: 2.0.10-canary.1
turbo-windows-arm64: 2.0.10-canary.1
dependenciesMeta:
turbo-darwin-64:
optional: true
Expand All @@ -22324,7 +22324,7 @@ __metadata:
optional: true
bin:
turbo: bin/turbo
checksum: d00655987e5d2e714d5e5a8d5950624508fb69e8671ca17e8ac7b9316ce01e518308ec4eaa472306950782704caa2eaa3c4fb328192818fcd9fcc05423bc29e7
checksum: 60fde9bd00c911a545b02f69185098cfd594d96d776a01f99b102384d3eafb927502f07317e04b272c6596dd6bcfdc1a97977cf1db7cb465d756a0dbb5313c5d
languageName: node
linkType: hard

Expand Down

0 comments on commit b485c2e

Please sign in to comment.