Skip to content

Commit

Permalink
publish 1.7.1-canary.3 to registry (vercel#3402)
Browse files Browse the repository at this point in the history
This includes release flow changes to pack with pnpm instead of npm to
ensure we convert workspace references correctly.

This branch has already released, which is why I'm including them here.

Co-authored-by: Turbobot <[email protected]>
  • Loading branch information
tknickman and turbobot-temp authored Jan 20, 2023
1 parent 583e75f commit aea9514
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 35 deletions.
39 changes: 19 additions & 20 deletions cli/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ cmd/turbo/version.go: ../version.txt
mv cmd/turbo/version.go.txt cmd/turbo/version.go

build: install
# cd $(CLI_DIR)/../packages/turbo-ignore && pnpm install --filter=turbo-ignore && npm run build
cd $(CLI_DIR)/../packages/create-turbo && pnpm install --filter=create-turbo && npm run build
cd $(CLI_DIR)/../packages/turbo-codemod && pnpm install --filter=@turbo/codemod && npm run build
# cd $(CLI_DIR)/../packages/turbo-ignore && pnpm install --filter=turbo-ignore && pnpm run build
cd $(CLI_DIR)/../packages/create-turbo && pnpm install --filter=create-turbo && pnpm run build
cd $(CLI_DIR)/../packages/turbo-codemod && pnpm install --filter=@turbo/codemod && pnpm run build

.PHONY: prepublish
prepublish: compile-protos cmd/turbo/version.go
Expand Down Expand Up @@ -152,10 +152,10 @@ stage-release: cmd/turbo/version.go
@test "" != "`git diff -- $(CLI_DIR)/cmd/turbo/version.go`" || (echo "Refusing to publish with unupdated version.go" && false)

# Prepare the packages.
cd $(CLI_DIR)/../packages/turbo && npm version "$(TURBO_VERSION)" --allow-same-version
# cd $(CLI_DIR)/../packages/turbo-ignore && npm version "$(TURBO_VERSION)" --allow-same-version
cd $(CLI_DIR)/../packages/create-turbo && npm version "$(TURBO_VERSION)" --allow-same-version
cd $(CLI_DIR)/../packages/turbo-codemod && npm version "$(TURBO_VERSION)" --allow-same-version
cd $(CLI_DIR)/../packages/turbo && pnpm version "$(TURBO_VERSION)" --allow-same-version
# cd $(CLI_DIR)/../packages/turbo-ignore && pnpm version "$(TURBO_VERSION)" --allow-same-version
cd $(CLI_DIR)/../packages/create-turbo && pnpm version "$(TURBO_VERSION)" --allow-same-version
cd $(CLI_DIR)/../packages/turbo-codemod && pnpm version "$(TURBO_VERSION)" --allow-same-version

git checkout -b staging-$(TURBO_VERSION)
git commit -anm "publish $(TURBO_VERSION) to registry"
Expand All @@ -172,15 +172,14 @@ publish: clean build

npm config set --location=project "//registry.npmjs.org/:_authToken" $(NPM_TOKEN)


# Publishes the native npm modules.
goreleaser release --rm-dist -f combined-release.yml

# Split packing from the publish step so that npm locates the correct .npmrc file.
npm pack $(CLI_DIR)/../packages/turbo --pack-destination=$(CLI_DIR)/../
npm pack $(CLI_DIR)/../packages/turbo-ignore --pack-destination=$(CLI_DIR)/../
npm pack $(CLI_DIR)/../packages/create-turbo --pack-destination=$(CLI_DIR)/../
npm pack $(CLI_DIR)/../packages/turbo-codemod --pack-destination=$(CLI_DIR)/../
# Split packing from the publish step so that pnpm locates the correct .npmrc file.
cd $(CLI_DIR)/../packages/turbo && pnpm pack --pack-destination=$(CLI_DIR)/../
cd $(CLI_DIR)/../packages/turbo-ignore && pnpm pack --pack-destination=$(CLI_DIR)/../
cd $(CLI_DIR)/../packages/create-turbo && pnpm pack --pack-destination=$(CLI_DIR)/../
cd $(CLI_DIR)/../packages/turbo-codemod && pnpm pack --pack-destination=$(CLI_DIR)/../

# Publish the remaining JS packages in order to avoid race conditions.
cd $(CLI_DIR)/../
Expand All @@ -203,10 +202,10 @@ snapshot-turbo:
goreleaser release --rm-dist -f combined-shim.yml --snapshot

# Split packing from the publish step so that npm locates the correct .npmrc file.
npm pack $(CLI_DIR)/../packages/turbo --pack-destination=$(CLI_DIR)/dist/
npm pack $(CLI_DIR)/../packages/turbo-ignore --pack-destination=$(CLI_DIR)/dist/
npm pack $(CLI_DIR)/../packages/create-turbo --pack-destination=$(CLI_DIR)/dist/
npm pack $(CLI_DIR)/../packages/turbo-codemod --pack-destination=$(CLI_DIR)/dist/
cd $(CLI_DIR)/../packages/turbo && pnpm pack --pack-destination=$(CLI_DIR)/dist/
cd $(CLI_DIR)/../packages/turbo-ignore && pnpm pack --pack-destination=$(CLI_DIR)/dist/
cd $(CLI_DIR)/../packages/create-turbo && pnpm pack --pack-destination=$(CLI_DIR)/dist/
cd $(CLI_DIR)/../packages/turbo-codemod && pnpm pack --pack-destination=$(CLI_DIR)/dist/


.PHONY: publish-turbo
Expand All @@ -223,9 +222,9 @@ publish-turbo: clean build
goreleaser release --rm-dist -f combined-shim.yml

# Split packing from the publish step so that npm locates the correct .npmrc file.
npm pack $(CLI_DIR)/../packages/turbo --pack-destination=$(CLI_DIR)/../
npm pack $(CLI_DIR)/../packages/create-turbo --pack-destination=$(CLI_DIR)/../
npm pack $(CLI_DIR)/../packages/turbo-codemod --pack-destination=$(CLI_DIR)/../
cd $(CLI_DIR)/../packages/turbo && pnpm pack --pack-destination=$(CLI_DIR)/../
cd $(CLI_DIR)/../packages/create-turbo && pnpm pack --pack-destination=$(CLI_DIR)/../
cd $(CLI_DIR)/../packages/turbo-codemod && pnpm pack --pack-destination=$(CLI_DIR)/../

# Publish the remaining JS packages in order to avoid race conditions.
cd $(CLI_DIR)/../
Expand Down
2 changes: 1 addition & 1 deletion cli/cmd/turbo/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package main

const turboVersion = "1.7.1-canary.2"
const turboVersion = "1.7.1-canary.3"
2 changes: 1 addition & 1 deletion packages/create-turbo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "create-turbo",
"version": "1.7.1-canary.2",
"version": "1.7.1-canary.3",
"description": "Create a new Turborepo",
"homepage": "https://turbo.build/repo",
"license": "MPL-2.0",
Expand Down
5 changes: 2 additions & 3 deletions packages/turbo-codemod/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@turbo/codemod",
"version": "1.7.1-canary.2",
"version": "1.7.1-canary.3",
"description": "Provides Codemod transformations to help upgrade your Turborepo codebase when a feature is deprecated.",
"homepage": "https://turbo.build/repo",
"license": "MPL-2.0",
Expand All @@ -12,7 +12,7 @@
"bugs": {
"url": "https://github.com/vercel/turbo/issues"
},
"bin": "dist/index.js",
"bin": "dist/cli.js",
"scripts": {
"build": "tsup",
"test": "jest",
Expand All @@ -33,7 +33,6 @@
"is-git-clean": "^1.1.0",
"ora": "4.1.1",
"semver": "^7.3.7",
"turbo-utils": "workspace:*",
"update-check": "^1.5.4"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions packages/turbo-codemod/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ export default defineConfig((options: Options) => ({
entry: ["src/cli.ts", "src/transforms/*.ts"],
format: ["cjs"],
clean: true,
minify: true,
...options,
}));
14 changes: 7 additions & 7 deletions packages/turbo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "turbo",
"version": "1.7.1-canary.2",
"version": "1.7.1-canary.3",
"description": "Turborepo is a high-performance build system for JavaScript and TypeScript codebases.",
"repository": "https://github.com/vercel/turbo",
"bugs": "https://github.com/vercel/turbo/issues",
Expand All @@ -19,11 +19,11 @@
"install.js"
],
"optionalDependencies": {
"turbo-darwin-64": "1.7.1-canary.2",
"turbo-darwin-arm64": "1.7.1-canary.2",
"turbo-linux-64": "1.7.1-canary.2",
"turbo-linux-arm64": "1.7.1-canary.2",
"turbo-windows-64": "1.7.1-canary.2",
"turbo-windows-arm64": "1.7.1-canary.2"
"turbo-darwin-64": "1.7.1-canary.3",
"turbo-darwin-arm64": "1.7.1-canary.3",
"turbo-linux-64": "1.7.1-canary.3",
"turbo-linux-arm64": "1.7.1-canary.3",
"turbo-windows-64": "1.7.1-canary.3",
"turbo-windows-arm64": "1.7.1-canary.3"
}
}
2 changes: 0 additions & 2 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1.7.1-canary.2
1.7.1-canary.3
canary

0 comments on commit aea9514

Please sign in to comment.