Skip to content

Commit

Permalink
Merge branch 'main' into fix-shared-runtime
Browse files Browse the repository at this point in the history
  • Loading branch information
kwonoj committed Jun 14, 2023
2 parents b07e0c4 + d461eca commit 57436a4
Show file tree
Hide file tree
Showing 222 changed files with 6,505 additions and 1,176 deletions.
56 changes: 11 additions & 45 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ jobs:
with:
PATTERNS: |
examples/**
turborepo-tests/examples/**
examples-tests/**
!**.md
!**.mdx
Expand Down Expand Up @@ -306,8 +306,8 @@ jobs:
- name: E2E Tests
run: turbo run test --filter=turborepo-tests-e2e

go_examples:
name: Go Cli Examples
turborepo_examples:
name: Turborepo Examples
needs: determine_jobs
if: needs.determine_jobs.outputs.examples == 'true'
timeout-minutes: 30
Expand All @@ -320,43 +320,9 @@ jobs:
runner: ubuntu-latest
- name: macos
runner: macos-latest
manager: [yarn, npm]
example: [with-yarn, with-npm, non-monorepo]
include:
- os:
name: ubuntu
runner: ubuntu-latest
manager: pnpm
example: basic
- os:
name: macos
runner: macos-latest
manager: pnpm
example: basic
- os:
name: ubuntu
runner: ubuntu-latest
manager: pnpm
example: kitchen-sink
- os:
name: macos
runner: macos-latest
manager: pnpm
example: kitchen-sink
- os:
name: ubuntu
runner: ubuntu-latest
manager: pnpm
example: with-svelte
- os:
name: macos
runner: macos-latest
manager: pnpm
example: with-svelte

runs-on: ${{ matrix.os.runner }}
steps:
# Used by scripts/check-examples.sh
# Used by examples-tests/setup.sh
- name: Install Sponge
shell: bash
run: |
Expand Down Expand Up @@ -404,12 +370,12 @@ jobs:
cache: ${{ matrix.manager }}
cache-dependency-path: package.json

- name: Check \"${{ matrix.example }}\" example with \"${{ matrix.manager }}\"
- name: Check examples
shell: bash
# Note: using CLI flags instead of env vars because
# envs var would apply to the actual tests that exercise turbo also,
# making test output non-deterministic.
run: turbo run test --color --remote-only --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} --filter="turborepo-tests-examples" -- "${{ matrix.example }}" "${{ matrix.manager }}"
run: turbo run example-test --continue --color --remote-only --token=${{ secrets.TURBO_TOKEN }} --team=${{ vars.TURBO_TEAM }} --filter="!@turborepo-examples-tests/pnpm-gatsby"

# 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
Expand Down Expand Up @@ -459,7 +425,7 @@ jobs:

- name: Run tests
run: |
turbo run check-types test --filter=...[${{ github.event.pull_request.base.sha || 'HEAD^1' }}] --filter="./packages/*" --color
turbo run check-types test --filter={./packages/*}...[${{ github.event.pull_request.base.sha || 'HEAD^1' }}] --color
turbopack_typescript:
name: Turbopack TypeScript files
Expand Down Expand Up @@ -1289,7 +1255,7 @@ jobs:
- determine_jobs
- go_lint
- go_unit
- go_examples
- turborepo_examples
- go_e2e
- go_integration
- js_packages
Expand Down Expand Up @@ -1327,7 +1293,7 @@ jobs:
subjob ${{needs.determine_jobs.result}} "Determining jobs"
subjob ${{needs.go_lint.result}} "Go lints"
subjob ${{needs.go_unit.result}} "Go unit tests"
subjob ${{needs.go_examples.result}} "Go examples"
subjob ${{needs.turborepo_examples.result}} "Turborepo examples"
subjob ${{needs.go_e2e.result}} "Go e2e tests"
subjob ${{needs.go_integration.result}} "Go integration tests"
subjob ${{needs.js_packages.result}} "JS Package tests"
Expand Down Expand Up @@ -1441,7 +1407,7 @@ jobs:
- determine_jobs
- go_lint
- go_unit
- go_examples
- turborepo_examples
- go_e2e
- go_integration
- rust_prepare
Expand Down Expand Up @@ -1482,7 +1448,7 @@ jobs:
subjob ${{needs.determine_jobs.result}} "Determining jobs"
subjob ${{needs.go_lint.result}} "Go lints"
subjob ${{needs.go_unit.result}} "Go unit tests"
subjob ${{needs.go_examples.result}} "Go examples"
subjob ${{needs.turborepo_examples.result}} "Turborepo examples"
subjob ${{needs.go_e2e.result}} "Go e2e tests"
subjob ${{needs.go_integration.result}} "Go integration tests"
subjob ${{needs.rust_prepare.result}} "Rust prepare"
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,6 @@ cli/internal/ffi/libturborepo_ffi*.a

# generated by tonic
file_descriptor_set.bin

# include .env files for tests
!**/__fixtures__/**/*.env
11 changes: 11 additions & 0 deletions .vscode/turborepo.code-workspace
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"folders": [
{
"name": "turbo",
"path": "../"
},
{
"path": "../packages/eslint-plugin-turbo"
}
]
}
4 changes: 4 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,10 @@ Install `cargo-nextest` (https://nexte.st/):
`cargo install cargo-nextest`
Then, install dependencies for testcases:
`pnpm install -r --side-effects-cache -C crates/turbopack/tests/node-file-trace`
Run via:
```shell
Expand Down
Loading

0 comments on commit 57436a4

Please sign in to comment.