Skip to content

Commit b6f78c9

Browse files
Test against ember-concurrency@v3 (#868)
* 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!
1 parent d298eaa commit b6f78c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+4201
-1925
lines changed

.changeset/config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
"access": "public",
1515
"baseBranch": "main",
1616
"updateInternalDependencies": "patch",
17-
"ignore": ["docs", "test-app", "@nullvoxpopuli/estimate-bytes"]
17+
"ignore": ["docs", "test-app", "@nullvoxpopuli/estimate-bytes", "test-app-ec-2", "test-app-ec-3"]
1818
}

.changeset/thin-rules-scream.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"ember-resources": patch
3+
---
4+
5+
Test against ember-concurrency@v3, and add it as an allowed peerDepnedency

.github/renovate.json5

+6
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,12 @@
119119
"matchDepTypes": ["dependencies"],
120120
"enabled": false
121121
},
122+
{
123+
// these apps test specific ember-concurrency versions
124+
"matchPaths": ["test-app-ec-2/package.json", "test-app-ec-3/package.json"],
125+
"matchDepPatterns": ["ember-concurrency"],
126+
"enabled": false,
127+
},
122128
{
123129
// changing engines forces other people to need to upgrade their minimum node
124130
// therefor engine changes are breaking changes

.github/workflows/ci.yml

+24-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@ jobs:
6969
- name: 'Type checking'
7070

7171
run: |
72-
pnpm --filter test-app exec tsc -v;
73-
pnpm --filter test-app exec glint --version;
74-
pnpm --filter test-app exec glint;
72+
pnpm --filter "test-app*" exec tsc -v;
73+
pnpm --filter "test-app*" exec glint --version;
74+
pnpm --filter "test-app*" exec glint;
7575
7676
7777
@@ -133,6 +133,26 @@ jobs:
133133
node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
134134
--skip-cleanup
135135
136+
test-ember-concurrency:
137+
name: "w/ ${{ matrix.concurrencyVersion }}"
138+
timeout-minutes: 5
139+
runs-on: ubuntu-latest
140+
needs: [default_tests]
141+
142+
strategy:
143+
fail-fast: false
144+
matrix:
145+
concurrencyVersion:
146+
- "test-app-ember-concurrency-2"
147+
- "test-app-ember-concurrency-3"
148+
149+
steps:
150+
- uses: actions/checkout@v3
151+
- uses: NullVoxPopuli/action-setup-pnpm@v2
152+
- uses: ./.github/actions/download-built-package
153+
- name: Run Tests
154+
run: pnpm test:ember
155+
working-directory: ${{ matrix.concurrencyVersion }}
136156

137157

138158
# https://github.com/changesets/action
@@ -146,6 +166,7 @@ jobs:
146166
- floating_tests
147167
- typecheck
148168
- try_scenarios
169+
- test-ember-concurrency
149170

150171
steps:
151172
- uses: actions/checkout@v3

ember-resources/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
"@glimmer/tracking": "^1.1.2",
110110
"@glint/template": "^1.0.0-beta.3 || ^1.0.0",
111111
"ember-async-data": "^1.0.1",
112-
"ember-concurrency": "^2.0.0",
112+
"ember-concurrency": "^2.0.0 || ^3.0.0",
113113
"ember-source": "^3.28.0 || ^4.0.0 || ^5.0.0"
114114
},
115115
"peerDependenciesMeta": {

0 commit comments

Comments
 (0)