Skip to content

Commit

Permalink
Merge branch 'main' into mk/cli-build
Browse files Browse the repository at this point in the history
  • Loading branch information
mehulkar committed Apr 26, 2023
2 parents 313a8f8 + c463f84 commit 2d0539f
Show file tree
Hide file tree
Showing 191 changed files with 5,597 additions and 2,896 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ pnpm-lock.yaml
/crates @vercel/web-tooling
# overrides for crates that are owned by turbo-oss
/crates/globwatch @vercel/turbo-oss
/crates/pidlock @vercel/turbo-oss
/crates/turbopath @vercel/turbo-oss
/crates/turborepo @vercel/turbo-oss
/crates/turborepo-api-client @vercel/turbo-oss
Expand Down
46 changes: 28 additions & 18 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ jobs:
xtask/**
.cargo/**
rust-toolchain
!glob-watch
!crates/glob-match/**
!crates/globwatch/**
!crates/pidlock/**
!crates/turborepo/**
!crates/turborepo-api-client/**
!crates/turborepo-lib/**
Expand All @@ -114,14 +116,16 @@ jobs:
crates/turbopack-bench/**
!*.md
- name: Turborepo related changes
id: turborepo
- name: Turborepo Rust related changes
id: turborepo_rust
uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
pnpm-lock.yaml
package.json
glob-watch
crates/glob-match/**
crates/globwatch/**
crates/pidlock/**
crates/turborepo/**
crates/turborepo-api-client/**
crates/turborepo-lib/**
Expand All @@ -134,23 +138,28 @@ jobs:
!**.md
!**.mdx
- name: Go related changes
id: go
- name: Turborepo Go related changes
id: turborepo_go
uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
cli/**
- name: Go E2E related changes
id: go_e2e
- name: Turborepo integration tests changes
id: turborepo_integration
uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
cli/**
crates/turborepo*
crates/turborepo*/**
crates/turbo-updater
Cargo.lock
turborepo-tests/integration/**
turborepo-tests/helpers/**
- name: Turborepo e2e tests changes
id: turborepo_e2e
uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
turborepo-tests/e2e/**
turborepo-tests/helpers/**
- name: Examples related changes
id: examples
Expand All @@ -174,10 +183,11 @@ jobs:
# We only test workspace dependency changes on main, not on PRs to speed up CI
cargo_on_main: ${{ steps.ci.outputs.diff != '' || (steps.cargo.outputs.diff != '' && github.event_name == 'push' && github.ref == 'refs/heads/main') }}
turbopack: ${{ steps.ci.outputs.diff != '' || steps.turbopack.outputs.diff != '' }}
turborepo: ${{ steps.ci.outputs.diff != '' || steps.turborepo.outputs.diff != '' }}
turborepo_rust: ${{ steps.ci.outputs.diff != '' || steps.turborepo_rust.outputs.diff != '' }}
turbopack_bench: ${{ steps.ci.outputs.diff != '' || steps.turbopack_bench.outputs.diff != '' }}
go: ${{ steps.ci.outputs.diff != '' || steps.go.outputs.diff != '' }}
go_e2e: ${{ steps.ci.outputs.diff != '' || steps.go.outputs.diff != '' || steps.go_e2e.outputs.diff != '' }}
go: ${{ steps.ci.outputs.diff != '' || steps.turborepo_go.outputs.diff != '' }}
go_e2e: ${{ steps.ci.outputs.diff != '' || steps.turborepo_go.outputs.diff != '' || steps.turborepo_rust.outputs.diff != '' || steps.turborepo_e2e.outputs.diff != '' }}
go_integration: ${{ steps.ci.outputs.diff != '' || steps.turborepo_go.outputs.diff != '' || steps.turborepo_rust.outputs.diff != '' || steps.turborepo_integration.outputs.diff != '' }}
examples: ${{ steps.ci.outputs.diff != '' || steps.examples.outputs.diff != '' }}
format: ${{ steps.ci.outputs.diff != '' || steps.format.outputs.diff != '' }}
push: ${{ steps.ci.outputs.diff != '' || github.event_name == 'push' }}
Expand Down Expand Up @@ -244,7 +254,7 @@ jobs:
go_integration:
name: Go Integration Tests
needs: determine_jobs
if: needs.determine_jobs.outputs.go_e2e == 'true'
if: needs.determine_jobs.outputs.go_integration == 'true'
timeout-minutes: 30
runs-on: ${{ matrix.os.runner }}
strategy:
Expand Down Expand Up @@ -577,7 +587,7 @@ jobs:
turborepo_rust_test:
needs: [determine_jobs, rust_prepare]
# We test dependency changes only on main
if: needs.determine_jobs.outputs.turborepo == 'true' || needs.determine_jobs.outputs.cargo_on_main == 'true'
if: needs.determine_jobs.outputs.turborepo_rust == 'true' || needs.determine_jobs.outputs.cargo_on_main == 'true'
strategy:
fail-fast: false
matrix:
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,6 @@ cli/internal/ffi/libturborepo_ffi*.a
*.t.rej
*.t.orig
.cram_env

# generated by tonic
file_descriptor_set.bin
Loading

0 comments on commit 2d0539f

Please sign in to comment.