Skip to content

Commit

Permalink
Merge branch 'main' into replace-rimraf-native
Browse files Browse the repository at this point in the history
  • Loading branch information
anthonyshew authored Jul 23, 2024
2 parents 31addf6 + 60b5bf0 commit 3a9f7ac
Show file tree
Hide file tree
Showing 307 changed files with 16,176 additions and 5,794 deletions.
2 changes: 2 additions & 0 deletions .github/actions/setup-turborepo-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ runs:
with:
extra-flags: --no-optional
node-version: ${{ inputs.node-version }}
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1

- name: "Setup Rust"
uses: ./.github/actions/setup-rust
Expand Down
4 changes: 2 additions & 2 deletions .github/turbo-orchestrator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ labeler:
# created-by
- label: "created-by: turbopack"
when:
isPRAuthorMatch: "^(bgw|ForsakenHarmony|kdy1|kwonoj|padmaia|sokra|wbinnssmith)$"
isPRAuthorMatch: "^(arlyon|bgw|ForsakenHarmony|kdy1|LichuAcu|mischnic|padmaia|sokra|wbinnssmith)$"
- label: "created-by: turborepo"
when:
isPRAuthorMatch: "^(anthonyshew|dimitropoulos|tknickman|mehulkar|chris-olszewski|NicholasLYang|Zertsov|paulogdm|codybrouwers)$"

# needs: triage when not any of the turbopack or turborepo team
- label: "needs: triage"
when:
isNotPRAuthorMatch: "^(bgw|ForsakenHarmony|kdy1|kwonoj|padmaia|sokra|wbinnssmith|anthonyshew|tknickman|mehulkar|chris-olszewski|NicholasLYang|arlyon|Zertsov|paulogdm|codybrouwers)$"
isNotPRAuthorMatch: "^(arlyon|bgw|ForsakenHarmony|kdy1|LichuAcu|mischnic|padmaia|sokra|wbinnssmith|anthonyshew|dimitropoulos|tknickman|mehulkar|chris-olszewski|NicholasLYang|Zertsov|paulogdm|codybrouwers)$"

# areas
- label: "area: ci"
Expand Down
17 changes: 12 additions & 5 deletions .github/workflows/test-js-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
docs: ${{ steps.docs.outputs.diff != '' }}

js_packages:
name: JS Package Tests
name: "JS Package Tests (${{matrix.os.name}}, Node ${{matrix.node-version}})"
timeout-minutes: 30
if: needs.determine_jobs.outputs.ci == 'true' || needs.determine_jobs.outputs.packages == 'true' || needs.determine_jobs.outputs.docs == 'true'
needs: [determine_jobs]
Expand All @@ -69,6 +69,9 @@ jobs:
- "metal"
- name: macos
runner: macos-12
node-version:
- 18
- 20
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
Expand All @@ -88,11 +91,13 @@ jobs:
ref: ${{ github.ref }}
fetch-depth: ${{ steps.fetch-depth.outputs.depth }}

- name: Setup Turborepo Environment
uses: ./.github/actions/setup-turborepo-environment
- name: "Setup Node"
uses: ./.github/actions/setup-node
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
node-version: "20"
extra-flags: --no-optional
node-version: ${{ matrix.node-version }}
env:
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1

- name: Install Global Turbo
uses: ./.github/actions/install-global-turbo
Expand All @@ -104,6 +109,8 @@ jobs:
# changes, and we don't want to enable that beahvior for _all_ our JS packages.
run: |
TURBO_API= turbo run check-types test --filter="!turborepo-repository" --filter={./packages/*}...[${{ github.event.pull_request.base.sha || 'HEAD^1' }}] --color --env-mode=strict
env:
NODE_VERSION: ${{ matrix.node-version }}

summary:
name: Turborepo JS Test Summary
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/turborepo-native-lib-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:

jobs:
js_native_packages:
name: JS Native Package Tests
name: "@turbo/repository (${{matrix.os.name}}, Node ${{matrix.node-version}})"
timeout-minutes: 30
runs-on: ${{ matrix.os.runner }}
strategy:
Expand All @@ -26,6 +26,9 @@ jobs:
- "metal"
- name: macos
runner: macos-latest
node-version:
- 18
- 20
env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ vars.TURBO_TEAM }}
Expand All @@ -46,9 +49,8 @@ jobs:
- name: Setup Turborepo Environment
uses: ./.github/actions/setup-turborepo-environment
with:
windows: ${{ matrix.os.name == 'windows' }}
github-token: "${{ secrets.GITHUB_TOKEN }}"
node-version: "20"
node-version: ${{ matrix.node-version }}

- name: Install Global Turbo
uses: ./.github/actions/install-global-turbo
Expand All @@ -57,3 +59,5 @@ jobs:
# Manually set TURBO_API to an empty string to override Hetzner env
run: |
TURBO_API= turbo run test --filter "turborepo-repository" --color --env-mode=strict
env:
NODE_VERSION: ${{ matrix.node-version }}
2 changes: 1 addition & 1 deletion .github/workflows/turborepo-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ jobs:
needs: [determine_jobs, build_turborepo]
if: needs.determine_jobs.outputs.turborepo_integration == 'true'
runs-on: ${{ matrix.os.runner }}
timeout-minutes: 30
timeout-minutes: 45
strategy:
fail-fast: false
matrix:
Expand Down
Loading

0 comments on commit 3a9f7ac

Please sign in to comment.