Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test against ember-concurrency@v3 #868

Merged
merged 10 commits into from
Apr 24, 2023
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
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