Skip to content

Commit 2e6fd19

Browse files
fix: fix Prisma 7 test issues (#5984)
[TML-1609](https://linear.app/prisma-company/issue/TML-1609/time-box-fix-ecosystem-tests) --------- Co-authored-by: Prismo <[email protected]>
1 parent 580af2b commit 2e6fd19

File tree

920 files changed

+27236
-34941
lines changed

Some content is hidden

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

920 files changed

+27236
-34941
lines changed

.github/prisma-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.1.0-dev.16
1+
7.1.0-dev.15

.github/scripts/check-engines-cli.sh

Lines changed: 0 additions & 123 deletions
This file was deleted.

.github/scripts/check-engines-client.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ elif [ $CLIENT_ENGINE_TYPE == "wasm" ]; then
132132
echo "WasmEngine: Enabled"
133133
case $os_name in
134134
linux)
135-
qe_location="$GENERATED_CLIENT/query_engine_bg.wasm"
135+
qe_location="$GENERATED_CLIENT/query_compiler_bg.wasm"
136136
;;
137137
osx)
138-
qe_location="$GENERATED_CLIENT/query_engine_bg.wasm"
138+
qe_location="$GENERATED_CLIENT/query_compiler_bg.wasm"
139139
;;
140140
windows*)
141-
qe_location="$GENERATED_CLIENT\query_engine_bg.wasm"
141+
qe_location="$GENERATED_CLIENT\query_compiler_bg.wasm"
142142
;;
143143
*)
144144
os_name=notset

.github/scripts/test-project.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ elif [ $code -eq 0 ]; then
159159
echo "-------------- Checking Engines -------------------------------"
160160
if [ -z "${SKIP_ENGINE_CHECK+x}" ]; then
161161
bash ../../.github/scripts/check-engines-client.sh "$dir" "$project"
162-
bash ../../.github/scripts/check-engines-cli.sh "$dir" "$project"
163162
else
164163
echo "SKIP_ENGINE_CHECK=$SKIP_ENGINE_CHECK, skipping"
165164
fi

.github/workflows/check-for-update.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-node@v4
2525
with:
26-
node-version: 18
26+
node-version: 20
2727
cache: 'pnpm'
2828
cache-dependency-path: '**/pnpm-lock.yaml'
2929

@@ -48,7 +48,7 @@ jobs:
4848

4949
- uses: actions/setup-node@v4
5050
with:
51-
node-version: 18
51+
node-version: 20
5252
cache: 'pnpm'
5353
cache-dependency-path: '**/pnpm-lock.yaml'
5454

@@ -73,7 +73,7 @@ jobs:
7373

7474
- uses: actions/setup-node@v4
7575
with:
76-
node-version: 18
76+
node-version: 20
7777
cache: 'pnpm'
7878
cache-dependency-path: '**/pnpm-lock.yaml'
7979

@@ -98,7 +98,7 @@ jobs:
9898

9999
- uses: actions/setup-node@v4
100100
with:
101-
node-version: 18
101+
node-version: 20
102102
cache: 'pnpm'
103103
cache-dependency-path: '**/pnpm-lock.yaml'
104104

.github/workflows/check-test-suite-coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- uses: actions/setup-node@v4
2323
with:
24-
node-version: 18
24+
node-version: 20
2525
cache: 'pnpm'
2626

2727
- name: Install Dependencies

.github/workflows/failing-weekly.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545
- uses: actions/setup-node@v4
4646
with:
47-
node-version: 18
47+
node-version: 20
4848
cache: 'pnpm'
4949
cache-dependency-path: ${{ github.job }}/${{ matrix.database }}/pnpm-lock.yaml
5050

.github/workflows/optional-test.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
- patch-dev
1616
- latest
1717
- integration
18+
- next
1819
pull_request:
1920
paths-ignore:
2021
- '*.md'
@@ -52,7 +53,7 @@ jobs:
5253
- uses: pnpm/[email protected]
5354
- uses: actions/setup-node@v4
5455
with:
55-
node-version: 18
56+
node-version: 20
5657
cache: 'pnpm'
5758
- name: Install Dependencies
5859
run: pnpm install
@@ -67,7 +68,7 @@ jobs:
6768
fail-fast: false
6869
matrix:
6970
generator: [prisma-dbml-generator, typegraphql-prisma, prisma-json-schema-generator, prisma-nestjs-graphql]
70-
clientEngine: ['library', 'binary']
71+
clientEngine: [client]
7172
runs-on: ubuntu-22.04
7273

7374
env:
@@ -83,7 +84,7 @@ jobs:
8384

8485
- uses: actions/setup-node@v4
8586
with:
86-
node-version: 18
87+
node-version: 20
8788
cache: 'pnpm'
8889
cache-dependency-path: ${{ github.job }}/${{ matrix.generator }}/pnpm-lock.yaml
8990

.github/workflows/scripts/detect-jobs-to-run.test.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ describe('detect-jobs-to-run', () => {
2525
"platforms-serverless-vercel",
2626
"core-features",
2727
"migrate",
28-
"engines",
29-
"os",
3028
"m1",
3129
"node",
3230
"accelerate",
@@ -107,8 +105,6 @@ describe('detect-jobs-to-run', () => {
107105
"platforms-serverless-vercel",
108106
"core-features",
109107
"migrate",
110-
"engines",
111-
"os",
112108
"m1",
113109
"node",
114110
"accelerate",
@@ -145,8 +141,6 @@ describe('detect-jobs-to-run', () => {
145141
"platforms-serverless-vercel",
146142
"core-features",
147143
"migrate",
148-
"engines",
149-
"os",
150144
"m1",
151145
"node",
152146
"accelerate",
@@ -183,8 +177,6 @@ describe('detect-jobs-to-run', () => {
183177
"platforms-serverless-vercel",
184178
"core-features",
185179
"migrate",
186-
"engines",
187-
"os",
188180
"m1",
189181
"node",
190182
"accelerate",

0 commit comments

Comments
 (0)