Merge branch 'main' into nicholasyang/port-fetch-artifact

NicholasLYang · Jun 21, 2023 · d9ccd16 · d9ccd16
2 parents a40bb53 + 8f3ec2c
commit d9ccd16
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 21 deletions.
diff --git 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/cmd/turbo/version.go b/cli/cmd/turbo/version.go
@@ -1,3 +1,3 @@
 package main
 
-const turboVersion = "1.10.4-canary.4"
+const turboVersion = "1.10.4"
diff --git a/cli/turbo.json b/cli/turbo.json
@@ -3,12 +3,14 @@
   "extends": ["//"],
   "pipeline": {
     "build": {
-      "env": ["GO_TAG", "RUNNER_OS"],
+      "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"
       ],
@@ -18,6 +20,8 @@
         "!**/*_test.go",
         "../crates/turborepo*/**/*.rs", // Rust crates
         "../crates/turborepo*/Cargo.toml",
+        "../Cargo.toml",
+        "../Cargo.lock",
         "!../crates/**/target"
       ]
     }

diff --git a/packages/create-turbo/package.json b/packages/create-turbo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-turbo",
-  "version": "1.10.4-canary.4",
+  "version": "1.10.4",
   "description": "Create a new Turborepo",
   "homepage": "https://turbo.build/repo",
   "license": "MPL-2.0",

diff --git a/packages/eslint-config-turbo/package.json b/packages/eslint-config-turbo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-turbo",
-  "version": "1.10.4-canary.4",
+  "version": "1.10.4",
   "description": "ESLint config for Turborepo",
   "repository": {
     "type": "git",

diff --git a/packages/eslint-plugin-turbo/package.json b/packages/eslint-plugin-turbo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-turbo",
-  "version": "1.10.4-canary.4",
+  "version": "1.10.4",
   "description": "ESLint plugin for Turborepo",
   "keywords": [
     "turbo",

diff --git a/packages/turbo-codemod/package.json b/packages/turbo-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@turbo/codemod",
-  "version": "1.10.4-canary.4",
+  "version": "1.10.4",
   "description": "Provides Codemod transformations to help upgrade your Turborepo codebase when a feature is deprecated.",
   "homepage": "https://turbo.build/repo",
   "license": "MPL-2.0",

diff --git a/packages/turbo-gen/package.json b/packages/turbo-gen/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@turbo/gen",
-  "version": "1.10.4-canary.4",
+  "version": "1.10.4",
   "description": "Extend a Turborepo",
   "homepage": "https://turbo.build/repo",
   "license": "MPL-2.0",

diff --git a/packages/turbo-ignore/package.json b/packages/turbo-ignore/package.json
@@ -1,6 +1,6 @@
 {
   "name": "turbo-ignore",
-  "version": "1.10.4-canary.4",
+  "version": "1.10.4",
   "description": "",
   "homepage": "https://turbo.build/repo",
   "keywords": [],

diff --git a/packages/turbo-types/package.json b/packages/turbo-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@turbo/types",
-  "version": "1.10.4-canary.4",
+  "version": "1.10.4",
   "description": "Turborepo types",
   "homepage": "https://turbo.build/repo",
   "license": "MPL-2.0",

diff --git a/packages/turbo-workspaces/package.json b/packages/turbo-workspaces/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@turbo/workspaces",
-  "version": "1.10.4-canary.4",
+  "version": "1.10.4",
   "description": "Tools for working with package managers",
   "homepage": "https://turbo.build/repo",
   "license": "MPL-2.0",

diff --git a/packages/turbo/package.json b/packages/turbo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "turbo",
-  "version": "1.10.4-canary.4",
+  "version": "1.10.4",
   "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",
@@ -19,11 +19,11 @@
     "install.js"
   ],
   "optionalDependencies": {
-    "turbo-darwin-64": "1.10.4-canary.4",
-    "turbo-darwin-arm64": "1.10.4-canary.4",
-    "turbo-linux-64": "1.10.4-canary.4",
-    "turbo-linux-arm64": "1.10.4-canary.4",
-    "turbo-windows-64": "1.10.4-canary.4",
-    "turbo-windows-arm64": "1.10.4-canary.4"
+    "turbo-darwin-64": "1.10.4",
+    "turbo-darwin-arm64": "1.10.4",
+    "turbo-linux-64": "1.10.4",
+    "turbo-linux-arm64": "1.10.4",
+    "turbo-windows-64": "1.10.4",
+    "turbo-windows-arm64": "1.10.4"
   }
 }
diff --git a/version.txt b/version.txt
@@ -1,2 +1,2 @@
-1.10.4-canary.4
-canary
+1.10.4
+latest