Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/actions/pnpm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,11 @@ runs:
run: |
pnpm -v
pnpm install
# Injected workspace-package copies are created by the install above,
# before any dist exists (fresh checkout). Only a *real* build (via
# `pnpm run`) triggers pnpm's syncInjectedDepsAfterScripts hook — a
# turbo cache replay restores dist into packages/* but leaves the
# injected copies empty. So force the builds to actually execute.
- name: 'Build workspace packages (sync injected deps)'
shell: 'bash'
run: pnpm build:packages --force
45 changes: 28 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ jobs:
fail-fast: true
matrix:
typescript-scenario:
- typescript@5.9
- typescript@6.0

steps:
Expand All @@ -73,10 +72,12 @@ jobs:

default_tests:
name: Default Tests
timeout-minutes: 5
timeout-minutes: 10
runs-on: ubuntu-latest
needs:
- install_dependencies
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v4
- name: TurboRepo local server
Expand All @@ -85,6 +86,10 @@ jobs:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: ./.github/actions/pnpm
- run: pnpm test
# For the Try Scenarios
- id: set-matrix
working-directory: ./test-app
run: echo "matrix=$(pnpm -s dlx @embroider/try list)" >> $GITHUB_OUTPUT

floating_tests:
name: Floating Deps Test
Expand All @@ -101,37 +106,43 @@ jobs:
- uses: ./.github/actions/pnpm
- name: Install Dependencies (without lockfile)
run: rm pnpm-lock.yaml && pnpm install
- run: pnpm test
# the fresh install re-created the injected workspace-package copies;
# --force makes the package builds really run so pnpm re-syncs them
- run: pnpm test --force

try_scenarios:
name: ${{ matrix.try-scenario }}
timeout-minutes: 5
name: ${{ matrix.name }}
timeout-minutes: 10
runs-on: ubuntu-latest
needs: [default_tests]

strategy:
fail-fast: false
matrix:
try-scenario:
- ember-lts-4.4
- ember-lts-4.8
- ember-release
- ember-beta
- ember-canary
- "'ember-lts-4.8 + embroider-safe'"
- "'ember-lts-4.8 + embroider-optimized'"
- "'ember-release + embroider-optimized'"
matrix: ${{ fromJson(needs.default_tests.outputs.matrix) }}

steps:
- uses: actions/checkout@v4
- name: TurboRepo local server
uses: felixmosh/turborepo-gh-artifacts@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: ./.github/actions/pnpm
- uses: pnpm/action-setup@v4.1.0
- uses: actions/setup-node@v4
with:
node-version: 24
- name: Apply Scenario
working-directory: ./test-app
run: pnpm dlx @embroider/try apply ${{ matrix.name }}
- name: Install Dependencies (scenario overrides, no lockfile)
run: pnpm install --no-lockfile
- name: Run Tests
working-directory: ./test-app
run: node_modules/.bin/ember try:one ${{matrix.try-scenario}} --skip-cleanup --- pnpm turbo test
# --force: a turbo cache replay restores the workspace packages' dist
# but skips the actual `pnpm run build`, so pnpm's
# syncInjectedDepsAfterScripts hook never refreshes the injected
# copies created by the scenario install
run: pnpm turbo test --force
env: ${{ matrix.env }}

publishDocs:
name: Publish Docs to Cloudflare Pages
Expand Down
2 changes: 1 addition & 1 deletion docs-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"ember-resources": "^7.0.0",
"highlight.js": "^11.6.0",
"highlightjs-glimmer": "^2.0.0",
"tracked-built-ins": "^3.1.0",
"tracked-built-ins": "^3.4.0",
"validated-changeset": "^1.3.4",
"yup": "^1.0.0"
},
Expand Down
5 changes: 3 additions & 2 deletions packages/changeset/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"peerDependencies": {
"@universal-ember/form": "workspace:^1",
"validated-changeset": "^1.3.4",
"ember-changeset": "^4.1.2",
"ember-changeset": "^4.1.2 || ^5.0.0",
"ember-source": ">=4.4.0"
},
"devDependencies": {
Expand All @@ -50,7 +50,8 @@
"ember-changeset": "^4.0.0",
"ember-template-lint": "^4.0.0",
"ember-source": "~5.12.0",
"eslint": "^9.0.0","@nullvoxpopuli/eslint-configs": "^6.0.0",
"eslint": "^9.0.0",
"@nullvoxpopuli/eslint-configs": "^6.0.0",
"prettier": "^3.8.1",
"rollup": "^4.0.0",
"rollup-plugin-copy": "^3.4.0",
Expand Down
10 changes: 4 additions & 6 deletions packages/ember-headless-form/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@
"@babel/runtime": "^7.20.7",
"@embroider/addon-shim": "^1.0.0",
"@embroider/util": "^1.10.0",
"ember-async-data": "^1.0.3",
"ember-async-data": "^2.0.1",
"ember-modifier": "^4.1.0",
"tracked-built-ins": "^3.1.0"
"tracked-built-ins": "^4.1.2"
},
"peerDependencies": {
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@glimmer/component": "^1.1.2 || ^2.0.0",
"ember-source": ">=4.4.0"
},
"devDependencies": {
Expand Down Expand Up @@ -87,8 +86,7 @@
"types": "./dist/*.d.ts",
"default": "./dist/*.js"
},
"./addon-main.js": "./addon-main.js",
"./-private/*": null
"./addon-main.js": "./addon-main.js"
},
"typesVersions": {
"*": {
Expand Down
Loading
Loading