From 3bb6b01f5c17c5679ffde40d5b1b9990e3cc6a15 Mon Sep 17 00:00:00 2001
From: Chris Olszewski <chris.olszewski@vercel.com>
Date: Wed, 17 Apr 2024 09:33:46 -0700
Subject: [PATCH] chore(ci): use prebuilt turbo for building js packages

---
 .github/workflows/turborepo-release.yml |  8 +++-----
 cli/Makefile                            | 17 ++++-------------
 cli/package.json                        |  2 +-
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/turborepo-release.yml b/.github/workflows/turborepo-release.yml
index c1be1d5c5b8aa..11bb46b267ee9 100644
--- a/.github/workflows/turborepo-release.yml
+++ b/.github/workflows/turborepo-release.yml
@@ -197,16 +197,14 @@ jobs:
         with:
           enable-corepack: false
 
+      - name: Install Global Turbo
+        uses: ./.github/actions/install-global-turbo
+
       - name: Configure git
         run: |
           git config --global user.name 'Turbobot'
           git config --global user.email 'turbobot@vercel.com'
 
-      - name: Setup turborepo environment
-        uses: ./.github/actions/setup-turborepo-environment
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-
       - name: Install GoReleaser
         uses: goreleaser/goreleaser-action@v3
         with:
diff --git a/cli/Makefile b/cli/Makefile
index 46e65f510c917..9fb6537173d5e 100644
--- a/cli/Makefile
+++ b/cli/Makefile
@@ -3,13 +3,9 @@ TURBO_TAG = $(shell cat ../version.txt | sed -n '2 p')
 
 CLI_DIR = $(shell pwd)
 
-.PHONY: install
-install:
-	pnpm install
-
-build: install
-	cd $(CLI_DIR)/../ && pnpm build:turbo
-	cd $(CLI_DIR)/../ && pnpm turbo-prebuilt build \
+# This only builds JS packages
+build:
+	cd $(CLI_DIR)/../ && turbo build \
 		--filter=create-turbo \
 		--filter=@turbo/codemod \
 		--filter=turbo-ignore \
@@ -48,7 +44,7 @@ stage-release:
 	git push origin staging-$(TURBO_VERSION) --tags --force
 
 .PHONY: publish-turbo
-publish-turbo: clean build
+publish-turbo: build
 	echo "Version: $(TURBO_VERSION)"
 	echo "Tag: $(TURBO_TAG)"
 
@@ -86,11 +82,6 @@ ifneq ($(SKIP_PUBLISH),--skip-publish)
 	npm publish -ddd --tag $(TURBO_TAG) $(CLI_DIR)/../turbo-types-$(TURBO_VERSION).tgz
 endif
 
-clean: clean-rust
-
-clean-rust:
-	cargo clean
-
 # use target fixture-<some directory under turborepo-tests/integration/fixtures> to set up the testbed directory
 .PHONY=fixture-%
 fixture-%:
diff --git a/cli/package.json b/cli/package.json
index b06a1229ef812..430365fa92d32 100644
--- a/cli/package.json
+++ b/cli/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "version": "0.0.0",
   "scripts": {
-    "clean": "make clean",
+    "clean": "cargo clean -p turbo",
     "build": "cargo build -p turbo",
     "build:release": "cargo build -p turbo --profile release-turborepo"
   }