Skip to content

Commit 646b915

Browse files
ZetazzzZetazzz
authored
Merge pull request #373 from launchql/fix/remove-corepack
remove corepack usage and apply matrix
2 parents 00c9082 + 6890ba9 commit 646b915

3 files changed

Lines changed: 78 additions & 120 deletions

File tree

‎.github/workflows/run-tests.yaml‎

Lines changed: 76 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,91 @@
1-
name: LaunchQL tests
1+
name: LaunchQL matrix tests
22
on:
33
push:
44
pull_request:
55
types: [opened, synchronized, reopened]
66
workflow_dispatch:
7+
workflow_call:
78

89
jobs:
9-
container-job:
10+
launchql-tests:
1011
runs-on: ubuntu-latest
1112
container: pyramation/node-sqitch:20.12.0
1213

14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
include:
18+
- package: packages/mime-bytes
19+
env: {}
20+
- package: packages/core
21+
env: {}
22+
- package: packages/cli
23+
env: {}
24+
- package: packages/client
25+
env:
26+
TEST_DATABASE_URL: postgres://postgres:password@pg_db:5432/postgres
27+
- package: packages/pgsql-test
28+
env: {}
29+
- package: packages/orm
30+
env: {}
31+
- package: packages/url-domains
32+
env: {}
33+
- package: packages/uuid-hash
34+
env: {}
35+
- package: packages/uuid-stream
36+
env: {}
37+
- package: packages/introspectron
38+
env: {}
39+
- package: packages/query-builder
40+
env: {}
41+
- package: packages/query
42+
env: {}
43+
- package: packages/launchql-gen
44+
env: {}
45+
- package: packages/pg-ast
46+
env: {}
47+
- package: packages/pg-codegen
48+
env: {}
49+
- package: packages/content-type-stream
50+
env: {}
51+
- package: packages/s3-streamer
52+
env:
53+
BUCKET_NAME: test-bucket
54+
- package: packages/upload-names
55+
env: {}
56+
- package: graphile/graphile-test
57+
env: {}
58+
- package: graphile/graphile-search-plugin
59+
env: {}
60+
- package: graphile/graphile-plugin-fulltext-filter
61+
env: {}
62+
- package: graphile/graphile-simple-inflector
63+
env: {}
64+
- package: graphile/graphile-i18n
65+
env: {}
66+
- package: graphile/graphile-meta-schema
67+
env: {}
68+
- package: graphile/graphile-upload-plugin
69+
env:
70+
BUCKET_NAME: test-upload-bucket
71+
- package: graphile/graphile-postgis
72+
env: {}
73+
- package: graphile/graphile-plugin-connection-filter
74+
env: {}
75+
- package: graphile/graphile-plugin-connection-filter-postgis
76+
env: {}
77+
- package: graphile/graphile-pg-type-mappings
78+
env: {}
79+
1380
env:
1481
PGHOST: pg_db
1582
PGPORT: 5432
1683
PGUSER: postgres
1784
PGPASSWORD: password
85+
MINIO_ENDPOINT: http://minio_cdn:9000
86+
AWS_ACCESS_KEY: minioadmin
87+
AWS_SECRET_KEY: minioadmin
88+
AWS_REGION: us-east-1
1889

1990
services:
2091
pg_db:
@@ -45,7 +116,6 @@ jobs:
45116
--health-retries 5
46117
47118
steps:
48-
# TODO remove deps on git config
49119
- name: Configure Git (for tests)
50120
run: |
51121
git config --global user.name "CI Test User"
@@ -69,116 +139,7 @@ jobs:
69139
run: |
70140
pnpm --filter @launchql/cli exec node dist/index.js admin-users bootstrap --yes
71141
pnpm --filter @launchql/cli exec node dist/index.js admin-users add --test --yes
72-
env:
73-
PGHOST: pg_db
74-
PGPORT: 5432
75-
PGUSER: postgres
76-
PGPASSWORD: password
77-
78-
- name: mime-bytes
79-
run: cd ./packages/mime-bytes && pnpm test
80-
81-
- name: launchql/core
82-
run: cd ./packages/core && pnpm test
83-
84-
- name: launchql/cli
85-
run: cd ./packages/cli && pnpm test
86-
87-
- name: launchql/client
88-
run: cd ./packages/client && pnpm test
89-
env:
90-
TEST_DATABASE_URL: postgres://postgres:password@pg_db:5432/postgres
91-
92-
- name: graphile-test
93-
run: |
94-
cd ./graphile/graphile-test
95-
pnpm test
96-
97-
- name: pgsql-test
98-
run: |
99-
cd ./packages/pgsql-test
100-
pnpm test
101-
102-
- name: launchql/orm
103-
run: cd ./packages/orm && pnpm test
104-
105-
- name: launchql/url-domains
106-
run: cd ./packages/url-domains && pnpm test
107-
108-
- name: launchql/uuid-hash
109-
run: cd ./packages/uuid-hash && pnpm test
110-
111-
- name: launchql/uuid-stream
112-
run: cd ./packages/uuid-stream && pnpm test
113-
114-
- name: launchql/introspectron
115-
run: cd ./packages/introspectron && pnpm test
116-
117-
- name: launchql/query-builder
118-
run: cd ./packages/query-builder && pnpm test
119-
120-
- name: launchql/query
121-
run: cd ./packages/query && pnpm test
122-
123-
- name: launchql/launchql-gen
124-
run: cd ./packages/launchql-gen && pnpm test
125-
126-
- name: launchql/pg-ast
127-
run: cd ./packages/pg-ast && pnpm test
128-
129-
- name: launchql/pg-codegen
130-
run: cd ./packages/pg-codegen && pnpm test
131-
132-
- name: launchql-gen
133-
run: cd ./packages/launchql-gen && pnpm test
134-
135-
- name: launchql/content-type-stream
136-
run: cd ./packages/content-type-stream && pnpm test
137-
138-
- name: launchql/s3-streamer
139-
run: cd ./packages/s3-streamer && pnpm test
140-
env:
141-
MINIO_ENDPOINT: http://minio_cdn:9000
142-
AWS_ACCESS_KEY: minioadmin
143-
AWS_SECRET_KEY: minioadmin
144-
AWS_REGION: us-east-1
145-
BUCKET_NAME: test-bucket
146-
147-
- name: launchql/upload-names
148-
run: cd ./packages/upload-names && pnpm test
149-
150-
- name: graphile/graphile-search-plugin
151-
run: cd ./graphile/graphile-search-plugin && pnpm test
152-
153-
- name: graphile/graphile-plugin-fulltext-filter
154-
run: cd ./graphile/graphile-plugin-fulltext-filter && pnpm test
155-
156-
- name: graphile/graphile-simple-inflector
157-
run: cd ./graphile/graphile-simple-inflector && pnpm test
158-
159-
- name: graphile/graphile-i18n
160-
run: cd ./graphile/graphile-i18n && pnpm test
161-
162-
- name: graphile/graphile-meta-schema
163-
run: cd ./graphile/graphile-meta-schema && pnpm test
164-
165-
- name: graphile/graphile-upload-plugin
166-
run: cd ./graphile/graphile-upload-plugin && pnpm test
167-
env:
168-
MINIO_ENDPOINT: http://minio_cdn:9000
169-
AWS_ACCESS_KEY: minioadmin
170-
AWS_SECRET_KEY: minioadmin
171-
AWS_REGION: us-east-1
172-
BUCKET_NAME: test-upload-bucket
173-
174-
- name: graphile/graphile-postgis
175-
run: cd ./graphile/graphile-postgis && pnpm test
176-
177-
- name: graphile/graphile-plugin-connection-filter
178-
run: cd ./graphile/graphile-plugin-connection-filter && pnpm test
179142
180-
- name: graphile/graphile-plugin-connection-filter-postgis
181-
run: cd ./graphile/graphile-plugin-connection-filter-postgis && pnpm test
182-
183-
- name: graphile/graphile-pg-type-mappings
184-
run: cd ./graphile/graphile-pg-type-mappings && pnpm test
143+
- name: Test ${{ matrix.package }}
144+
run: cd ./${{ matrix.package }} && pnpm test
145+
env: ${{ matrix.env }}

‎Dockerfile‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ RUN set -eux; \
1515
apt-get install -y --no-install-recommends \
1616
ca-certificates curl git python3 make g++; \
1717
update-ca-certificates || true; \
18-
corepack enable; \
19-
corepack prepare pnpm@9.12.1 --activate; \
18+
npm install -g pnpm@9.12.1; \
2019
rm -rf /var/lib/apt/lists/*
2120

2221
# Copy full repo (build context must be repo root when building this image)
@@ -38,8 +37,7 @@ RUN set -eux; \
3837
apt-get update; \
3938
apt-get install -y --no-install-recommends ca-certificates postgresql-client; \
4039
update-ca-certificates || true; \
41-
corepack enable; \
42-
corepack prepare pnpm@9.12.1 --activate; \
40+
npm install -g pnpm@9.12.1; \
4341
rm -rf /var/lib/apt/lists/*
4442

4543
# Copy built repo from builder

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
"graphql": "15.10.1",
5252
"graphql-upload": "^13.0.0"
5353
},
54-
"packageManager": "pnpm@9.12.1",
5554
"pnpm": {
5655
"publicHoistPattern": [
5756
"@jest/test-sequencer"

0 commit comments

Comments
 (0)