From c834302b71f451321213493d12ad8272609e2be9 Mon Sep 17 00:00:00 2001 From: Greg Soltis Date: Wed, 21 Jun 2023 08:26:45 -0700 Subject: [PATCH 1/3] Add top-level rust cargo files to cli deps --- cli/turbo.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli/turbo.json b/cli/turbo.json index e3d439966176a..2e257ecf816ae 100644 --- a/cli/turbo.json +++ b/cli/turbo.json @@ -18,6 +18,8 @@ "!**/*_test.go", "../crates/turborepo*/**/*.rs", // Rust crates "../crates/turborepo*/Cargo.toml", + "../Cargo.toml", + "../Cargo.lock", "!../crates/**/target" ] } From 68684107a30d69a5d1b2116457cdfeecd50f416c Mon Sep 17 00:00:00 2001 From: Greg Soltis Date: Wed, 21 Jun 2023 08:57:03 -0700 Subject: [PATCH 2/3] Drop support for running CI without rust tag --- .github/workflows/test.yml | 2 -- cli/turbo.json | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9850b70e36111..1c5e0be1e3270 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -277,8 +277,6 @@ jobs: - name: Integration Tests run: turbo run test --filter=turborepo-tests-integration --color - env: - GO_TAG: rust turborepo_e2e: name: Turborepo E2E Tests diff --git a/cli/turbo.json b/cli/turbo.json index 2e257ecf816ae..40aa00cb4d4ea 100644 --- a/cli/turbo.json +++ b/cli/turbo.json @@ -3,7 +3,7 @@ "extends": ["//"], "pipeline": { "build": { - "env": ["GO_TAG", "RUNNER_OS"], + "env": ["RUNNER_OS"], "outputs": [ "../target/debug/go-turbo", "../target/debug/turbo", From df1dc302f44142786ebf37f56661e0d9b4f3a178 Mon Sep 17 00:00:00 2001 From: Greg Soltis Date: Wed, 21 Jun 2023 11:10:08 -0700 Subject: [PATCH 3/3] Include Go binaries on windows in outputs --- cli/turbo.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cli/turbo.json b/cli/turbo.json index 40aa00cb4d4ea..0901a19f104fe 100644 --- a/cli/turbo.json +++ b/cli/turbo.json @@ -6,9 +6,11 @@ "env": ["RUNNER_OS"], "outputs": [ "../target/debug/go-turbo", + "../target/debug/go-turbo.exe", "../target/debug/turbo", "../target/debug/turbo.exe", "../target/release/go-turbo", + "../target/release/go-turbo.exe", "../target/release/turbo", "../target/release/turbo.exe" ],