From 04a0b9b916f328055224323e844d95b11ce3a5b3 Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Tue, 14 Nov 2023 12:11:57 -0800 Subject: [PATCH 01/10] chore: enable rust codepath on CI --- .github/workflows/test.yml | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b48a2d7d44362..7d0276a49913d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -241,6 +241,7 @@ jobs: CARGO_INCREMENTAL: 0 AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + EXPERIMENTAL_RUST_CODEPATH: true - name: Run sccache stat for check shell: bash @@ -302,6 +303,8 @@ jobs: github-token: "${{ secrets.GITHUB_TOKEN }}" - run: turbo run test --filter=cli --color + env: + EXPERIMENTAL_RUST_CODEPATH: true turborepo_integration: name: Turborepo Integration Tests @@ -333,6 +336,8 @@ jobs: - name: Integration Tests run: turbo run test --filter=turborepo-tests-integration --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} + env: + EXPERIMENTAL_RUST_CODEPATH: true turborepo_integration_rust: name: Turborepo Integration Tests (Rust Codepath) @@ -365,6 +370,8 @@ jobs: - name: Integration Tests run: turbo run test:rust-codepath --filter=turborepo-tests-integration --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} + env: + EXPERIMENTAL_RUST_CODEPATH: true turborepo_e2e: name: Turborepo E2E Tests @@ -391,6 +398,8 @@ jobs: - name: E2E Tests run: turbo run test --filter=turborepo-tests-e2e --remote-only --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} --color --env-mode=strict + env: + EXPERIMENTAL_RUST_CODEPATH: true turborepo_examples: name: Turborepo Examples @@ -448,6 +457,8 @@ jobs: # envs var would apply to the actual tests that exercise turbo also, # making test output non-deterministic. run: turbo run example-test --color --remote-only --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} --env-mode=strict + env: + EXPERIMENTAL_RUST_CODEPATH: true # Re-enable corepack, actions/setup-node invokes other package managers and # that causes corepack to throw an error, so we disable it here. The "Post" step @@ -497,7 +508,9 @@ jobs: - name: Run tests run: | - turbo run check-types test --filter={./packages/*}...[${{ github.event.pull_request.base.sha || 'HEAD^1' }}] --color + turbo run check-types test --filter={./packages/*}...[${{ github.event.pull_request.base.sha || 'HEAD^1' }}] --color --env-mode=strict + env: + EXPERIMENTAL_RUST_CODEPATH: true turbopack_typescript: name: Turbopack TypeScript files @@ -935,7 +948,9 @@ jobs: # Filters some workspaces out: # - `cli` because it runs golangci-lint and this Job doesn't have all the dependencies for that. # - Other `@vercel/*` packages because ?? - run: turbo run lint --filter=!cli --filter=!@vercel/devlow-bench --filter=!@vercel/experimental-nft-next-plugin --filter=!@vercel/experimental-nft-next-plugin --filter=!turbopack-bump-action --filter=!next-integration-stat + run: turbo run lint --filter=!cli --filter=!@vercel/devlow-bench --filter=!@vercel/experimental-nft-next-plugin --filter=!@vercel/experimental-nft-next-plugin --filter=!turbopack-bump-action --filter=!next-integration-stat --env-mode=strict + env: + EXPERIMENTAL_RUST_CODEPATH: true final: name: Ok From 13ee7c3d851367a0176ab56928d815f473aafa5b Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Wed, 15 Nov 2023 08:51:07 -0800 Subject: [PATCH 02/10] add env logging --- cli/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/cli/Makefile b/cli/Makefile index 94deab8b71b9f..452b54b4ddb8c 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -140,6 +140,7 @@ clean-go: go clean -testcache -r test-go: $(GENERATED_FILES) $(GO_FILES) go.mod go.sum turborepo-ffi-install + set go test $(TURBO_RACE) -tags $(GO_TAG) ./... # protos need to be compiled before linting, since linting needs to pick up From 0bac06d5b6a40b5b710b034f7d35b7a497261a34 Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Wed, 15 Nov 2023 09:09:08 -0800 Subject: [PATCH 03/10] correct makefile format --- cli/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cli/Makefile b/cli/Makefile index 452b54b4ddb8c..48c82984002d2 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -140,8 +140,7 @@ clean-go: go clean -testcache -r test-go: $(GENERATED_FILES) $(GO_FILES) go.mod go.sum turborepo-ffi-install - set - go test $(TURBO_RACE) -tags $(GO_TAG) ./... + set && go test $(TURBO_RACE) -tags $(GO_TAG) ./... # protos need to be compiled before linting, since linting needs to pick up # some types from the generated code From c13badcf40a661e63bac4043263203dd6daa7ad5 Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Wed, 15 Nov 2023 09:53:02 -0800 Subject: [PATCH 04/10] remove makefile changes --- cli/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/Makefile b/cli/Makefile index 48c82984002d2..94deab8b71b9f 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -140,7 +140,7 @@ clean-go: go clean -testcache -r test-go: $(GENERATED_FILES) $(GO_FILES) go.mod go.sum turborepo-ffi-install - set && go test $(TURBO_RACE) -tags $(GO_TAG) ./... + go test $(TURBO_RACE) -tags $(GO_TAG) ./... # protos need to be compiled before linting, since linting needs to pick up # some types from the generated code From bc0222487e8aa02607f3bb8e8bbab6c22c980b80 Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Wed, 15 Nov 2023 10:09:32 -0800 Subject: [PATCH 05/10] add back env var logging --- cli/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/package.json b/cli/package.json index d229b27e25ce1..2624b5fcdebe0 100644 --- a/cli/package.json +++ b/cli/package.json @@ -4,8 +4,8 @@ "version": "0.0.0", "scripts": { "clean": "make clean", - "build": "make", - "test": "make test-go", + "build": "set && make", + "test": "set && make test-go", "format": "make fmt-go", "lint": "make lint-go", "lint:prettier": "prettier -c ./**/*.js ./**/*.ts --cache --ignore-path=../.prettierignore" From 830eb0ce7715668c0db3ca1f43e9eef4b3920cee Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Wed, 15 Nov 2023 12:33:28 -0800 Subject: [PATCH 06/10] even more logging --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7d0276a49913d..7463f650ee0a0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -232,7 +232,7 @@ jobs: windows: ${{ matrix.os.name == 'windows' }} github-token: "${{ secrets.GITHUB_TOKEN }}" - - run: turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} + - run: set && turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} env: SCCACHE_BUCKET: turborepo-sccache SCCACHE_REGION: us-east-2 @@ -302,7 +302,7 @@ jobs: windows: ${{ matrix.os.name == 'windows' }} github-token: "${{ secrets.GITHUB_TOKEN }}" - - run: turbo run test --filter=cli --color + - run: set && turbo run test --filter=cli --color env: EXPERIMENTAL_RUST_CODEPATH: true From ec52d49e90fcf1b26edb5ca5f80c7c278760be39 Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Wed, 15 Nov 2023 13:29:25 -0800 Subject: [PATCH 07/10] try this again --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7463f650ee0a0..b6ef397effbee 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -232,7 +232,8 @@ jobs: windows: ${{ matrix.os.name == 'windows' }} github-token: "${{ secrets.GITHUB_TOKEN }}" - - run: set && turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} + - run: | + set && turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} env: SCCACHE_BUCKET: turborepo-sccache SCCACHE_REGION: us-east-2 @@ -302,7 +303,8 @@ jobs: windows: ${{ matrix.os.name == 'windows' }} github-token: "${{ secrets.GITHUB_TOKEN }}" - - run: set && turbo run test --filter=cli --color + - run: | + set && turbo run test --filter=cli --color env: EXPERIMENTAL_RUST_CODEPATH: true From 8766b466a24e868bb3d4efa045a160183a6d7290 Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Wed, 15 Nov 2023 13:50:25 -0800 Subject: [PATCH 08/10] attempt number 3? --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6ef397effbee..d59c879f80557 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -233,7 +233,7 @@ jobs: github-token: "${{ secrets.GITHUB_TOKEN }}" - run: | - set && turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} + env && turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} env: SCCACHE_BUCKET: turborepo-sccache SCCACHE_REGION: us-east-2 @@ -304,7 +304,7 @@ jobs: github-token: "${{ secrets.GITHUB_TOKEN }}" - run: | - set && turbo run test --filter=cli --color + env && turbo run test --filter=cli --color env: EXPERIMENTAL_RUST_CODEPATH: true From ee601b06102bfc65b3eb33b07672006fdba69107 Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Wed, 15 Nov 2023 13:56:35 -0800 Subject: [PATCH 09/10] try forcing bash as shell --- .github/workflows/test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d59c879f80557..af49af8d631b6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -233,7 +233,7 @@ jobs: github-token: "${{ secrets.GITHUB_TOKEN }}" - run: | - env && turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} + set && turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} env: SCCACHE_BUCKET: turborepo-sccache SCCACHE_REGION: us-east-2 @@ -243,6 +243,7 @@ jobs: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} EXPERIMENTAL_RUST_CODEPATH: true + shell: bash - name: Run sccache stat for check shell: bash @@ -304,9 +305,10 @@ jobs: github-token: "${{ secrets.GITHUB_TOKEN }}" - run: | - env && turbo run test --filter=cli --color + set && turbo run test --filter=cli --color env: EXPERIMENTAL_RUST_CODEPATH: true + shell: bash turborepo_integration: name: Turborepo Integration Tests From ad2793cf5d4e09e2c04c4b93110b3875a8ebb8a9 Mon Sep 17 00:00:00 2001 From: Chris Olszewski Date: Wed, 15 Nov 2023 14:19:06 -0800 Subject: [PATCH 10/10] revert all debugging changes --- .github/workflows/test.yml | 6 ++---- cli/package.json | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index af49af8d631b6..aab1c0cb98072 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -232,8 +232,7 @@ jobs: windows: ${{ matrix.os.name == 'windows' }} github-token: "${{ secrets.GITHUB_TOKEN }}" - - run: | - set && turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} + - run: turbo run build --filter=cli --color --env-mode=strict --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} env: SCCACHE_BUCKET: turborepo-sccache SCCACHE_REGION: us-east-2 @@ -304,8 +303,7 @@ jobs: windows: ${{ matrix.os.name == 'windows' }} github-token: "${{ secrets.GITHUB_TOKEN }}" - - run: | - set && turbo run test --filter=cli --color + - run: turbo run test --filter=cli --color env: EXPERIMENTAL_RUST_CODEPATH: true shell: bash diff --git a/cli/package.json b/cli/package.json index 2624b5fcdebe0..d229b27e25ce1 100644 --- a/cli/package.json +++ b/cli/package.json @@ -4,8 +4,8 @@ "version": "0.0.0", "scripts": { "clean": "make clean", - "build": "set && make", - "test": "set && make test-go", + "build": "make", + "test": "make test-go", "format": "make fmt-go", "lint": "make lint-go", "lint:prettier": "prettier -c ./**/*.js ./**/*.ts --cache --ignore-path=../.prettierignore"