Skip to content

Commit

Permalink
Test against ember-concurrency@v3 (#868)
Browse files Browse the repository at this point in the history
* Test against ember-concurrency@v3

* Create separate test apps for ember-concurrency

* Packages need unique names

* Remove mentions of ember-concurrency in the original test-app

* Add the new test-apps to the workspaces file and include them in type checking

* Update the ember-concurrency v3 tests

* Don't have turbo yet

* More config changes, both apps pass now

* How did @embroider/macros get so far behind. weird

* Lockfile!
  • Loading branch information
NullVoxPopuli authored Apr 24, 2023
1 parent d298eaa commit b6f78c9
Show file tree
Hide file tree
Showing 84 changed files with 4,201 additions and 1,925 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": ["docs", "test-app", "@nullvoxpopuli/estimate-bytes"]
"ignore": ["docs", "test-app", "@nullvoxpopuli/estimate-bytes", "test-app-ec-2", "test-app-ec-3"]
}
5 changes: 5 additions & 0 deletions .changeset/thin-rules-scream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"ember-resources": patch
---

Test against ember-concurrency@v3, and add it as an allowed peerDepnedency
6 changes: 6 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@
"matchDepTypes": ["dependencies"],
"enabled": false
},
{
// these apps test specific ember-concurrency versions
"matchPaths": ["test-app-ec-2/package.json", "test-app-ec-3/package.json"],
"matchDepPatterns": ["ember-concurrency"],
"enabled": false,
},
{
// changing engines forces other people to need to upgrade their minimum node
// therefor engine changes are breaking changes
Expand Down
27 changes: 24 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ jobs:
- name: 'Type checking'

run: |
pnpm --filter test-app exec tsc -v;
pnpm --filter test-app exec glint --version;
pnpm --filter test-app exec glint;
pnpm --filter "test-app*" exec tsc -v;
pnpm --filter "test-app*" exec glint --version;
pnpm --filter "test-app*" exec glint;
Expand Down Expand Up @@ -133,6 +133,26 @@ jobs:
node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
--skip-cleanup
test-ember-concurrency:
name: "w/ ${{ matrix.concurrencyVersion }}"
timeout-minutes: 5
runs-on: ubuntu-latest
needs: [default_tests]

strategy:
fail-fast: false
matrix:
concurrencyVersion:
- "test-app-ember-concurrency-2"
- "test-app-ember-concurrency-3"

steps:
- uses: actions/checkout@v3
- uses: NullVoxPopuli/action-setup-pnpm@v2
- uses: ./.github/actions/download-built-package
- name: Run Tests
run: pnpm test:ember
working-directory: ${{ matrix.concurrencyVersion }}


# https://github.com/changesets/action
Expand All @@ -146,6 +166,7 @@ jobs:
- floating_tests
- typecheck
- try_scenarios
- test-ember-concurrency

steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion ember-resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"@glimmer/tracking": "^1.1.2",
"@glint/template": "^1.0.0-beta.3 || ^1.0.0",
"ember-async-data": "^1.0.1",
"ember-concurrency": "^2.0.0",
"ember-concurrency": "^2.0.0 || ^3.0.0",
"ember-source": "^3.28.0 || ^4.0.0 || ^5.0.0"
},
"peerDependenciesMeta": {
Expand Down
Loading

0 comments on commit b6f78c9

Please sign in to comment.