Skip to content

Commit ed7ed2e

Browse files
mmcardlemmcardle
committed
Update CI config
1 parent b9434d2 commit ed7ed2e

4 files changed

Lines changed: 67 additions & 53 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 46 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,33 +26,66 @@ jobs:
2626
2727
- run: yarn build
2828

29-
- name: Upload dist directory
29+
- name: Upload djangobuilder4 dist directory
3030
uses: actions/upload-artifact@v1
3131
with:
32-
name: dist
33-
path: dist
34-
35-
unit_tests:
36-
name: Unit Tests
32+
name: djangobuilder4_dist
33+
path: ./packages/djangobuilder4/dist
34+
35+
- name: Upload djangobuilder.io dist directory
36+
uses: actions/upload-artifact@v1
37+
with:
38+
name: djangobuilder.io_dist
39+
path: ./packages/djangobuilder.io/dist
40+
41+
smoke_tests:
42+
name: Smoke tests - djangobuilder-core
3743
needs: [build]
3844
runs-on: ubuntu-latest
3945
steps:
4046
- uses: actions/checkout@v2
4147
- run: yarn
42-
- run: yarn test:unit
48+
- run: yarn smoketest
4349

50+
core_tests:
51+
name: Core tests - djangobuilder-core
52+
needs: [smoke_tests]
53+
runs-on: ubuntu-latest
54+
steps:
55+
- uses: actions/checkout@v2
56+
- run: yarn
57+
- run: yarn coretest
58+
59+
test_v4:
60+
name: Unit Tests - djangobuilder 4
61+
needs: [build]
62+
runs-on: ubuntu-latest
63+
steps:
64+
- uses: actions/checkout@v2
65+
- run: yarn
66+
- run: yarn test_4
67+
4468
cli_tests:
45-
name: CLI Tests
69+
name: CLI Tests - djangobuilder 4
4670
needs: [build]
4771
runs-on: ubuntu-latest
4872
steps:
4973
- uses: actions/checkout@v2
5074
- run: yarn
51-
- run: script/run.sh
75+
- run: packages/djangobuilder.io/script/run.sh
76+
77+
io_tests:
78+
name: Unit Tests - djangobuilder.io
79+
needs: [build]
80+
runs-on: ubuntu-latest
81+
steps:
82+
- uses: actions/checkout@v2
83+
- run: yarn
84+
- run: yarn test_io
5285

5386
e2e_tests:
54-
name: E2E Tests
55-
needs: [build]
87+
name: E2E Tests - djangobuilder.io
88+
needs: [io_tests]
5689
runs-on: ubuntu-latest
5790
env:
5891
FIREBASE_TOKEN: ${{ secrets.FIREBASE_TOKEN }}
@@ -65,8 +98,8 @@ jobs:
6598
- name: Download dist
6699
uses: actions/download-artifact@v1
67100
with:
68-
name: dist
69-
- run: export yarn ci
101+
name: djangobuilder4_dist
102+
- run: yarn ci
70103
- uses: actions/upload-artifact@v2
71104
if: ${{ always() }}
72105
with:

‎package.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,17 @@
1212
],
1313
"scripts": {
1414
"dev": "yarn --cwd packages/djangobuilder4 dev",
15-
"build": "yarn run build_io && yarn build_4",
15+
"build": "yarn run build_io && yarn build_v4",
1616
"build_io": "yarn --cwd packages/djangobuilder.io build",
17-
"build_4": "yarn --cwd packages/djangobuilder4 build",
17+
"build_v4": "yarn --cwd packages/djangobuilder4 build",
1818
"lint": "yarn --cwd packages/djangobuilder4 lint",
1919
"devio": "yarn --cwd packages/djangobuilder.io dev",
2020
"buildio": "yarn --cwd packages/djangobuilder.io build",
2121
"smoketest": "yarn --cwd lib/djangobuilder-core run smoketest",
2222
"coretest": "yarn --cwd lib/djangobuilder-core run test",
23-
"test": "yarn run smoketest && yarn coretest"
23+
"test_v4": "yarn --cwd packages/djangobuilder4 run test:unit",
24+
"test_io": "yarn --cwd packages/djangobuilder.io run test:unit",
25+
"test": "yarn run smoketest && yarn coretest && yarn test_v4 && yarn test_io",
26+
"ci": "yarn --cwd packages/djangobuilder.io run ci"
2427
}
2528
}

‎packages/djangobuilder4/src/api.ts‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,6 @@ import type {
77
DjangoProject,
88
DjangoRelationship,
99
} from "@djangobuilder/core";
10-
import { useUserStore } from "./stores/user";
11-
import { storeToRefs } from "pinia";
12-
13-
const userStore = useUserStore();
14-
const { getFieldId, getRelationshipId } =
15-
storeToRefs(userStore);
1610

1711
async function updateProject(
1812
project: DjangoProject,
@@ -39,20 +33,14 @@ async function updateField(
3933
field: DjangoField,
4034
args: Record<string, string | boolean | number>
4135
) {
42-
const fieldid = getFieldId.value(field);
43-
if (fieldid) {
44-
await updateDoc(doc(db, "fields", fieldid), args);
45-
} else {
46-
throw new Error(`No field ${field.name}`);
47-
}
36+
await updateDoc(doc(db, "fields", field.id), args);
4837
}
4938

5039
async function updateRelationship(
5140
relationship: DjangoRelationship,
5241
args: Record<string, string | boolean | number>
5342
) {
54-
const relationshipid = getRelationshipId.value(relationship);
55-
await updateDoc(doc(db, "relationships", relationshipid), args);
43+
await updateDoc(doc(db, "relationships", relationship.id), args);
5644
}
5745

5846
export {

‎yarn.lock‎

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2023,12 +2023,7 @@
20232023
dependencies:
20242024
"@hapi/hoek" "^9.0.0"
20252025

2026-
"@sideway/formula@^3.0.0":
2027-
version "3.0.1"
2028-
resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
2029-
integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
2030-
2031-
"@sideway/formula@^3.0.1":
2026+
"@sideway/formula@^3.0.0", "@sideway/formula@^3.0.1":
20322027
version "3.0.1"
20332028
resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
20342029
integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
@@ -12202,11 +12197,6 @@ uuid@^8.3.2:
1220212197
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
1220312198
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
1220412199

12205-
uuid@^9.0.0:
12206-
version "9.0.0"
12207-
resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5"
12208-
integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==
12209-
1221012200
v8-compile-cache-lib@^3.0.1:
1221112201
version "3.0.1"
1221212202
resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
@@ -12275,18 +12265,6 @@ vite-plugin-vue2@1.9.0:
1227512265
source-map "^0.7.3"
1227612266
vue-template-es2015-compiler "^1.9.1"
1227712267

12278-
vite@^2.9.16:
12279-
version "2.9.16"
12280-
resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.16.tgz#daf7ba50f5cc37a7bf51b118ba06bc36e97898e9"
12281-
integrity sha512-X+6q8KPyeuBvTQV8AVSnKDvXoBMnTx8zxh54sOwmmuOdxkjMmEJXH2UEchA+vTMps1xw9vL64uwJOWryULg7nA==
12282-
dependencies:
12283-
esbuild "^0.14.27"
12284-
postcss "^8.4.13"
12285-
resolve "^1.22.0"
12286-
rollup ">=2.59.0 <2.78.0"
12287-
optionalDependencies:
12288-
fsevents "~2.3.2"
12289-
1229012268
"vite@^2.9.12 || ^3.0.0-0", vite@^3.0.4:
1229112269
version "3.2.5"
1229212270
resolved "https://registry.yarnpkg.com/vite/-/vite-3.2.5.tgz#dee5678172a8a0ab3e547ad4148c3d547f90e86a"
@@ -12299,6 +12277,18 @@ vite@^2.9.16:
1229912277
optionalDependencies:
1230012278
fsevents "~2.3.2"
1230112279

12280+
vite@^2.9.16:
12281+
version "2.9.16"
12282+
resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.16.tgz#daf7ba50f5cc37a7bf51b118ba06bc36e97898e9"
12283+
integrity sha512-X+6q8KPyeuBvTQV8AVSnKDvXoBMnTx8zxh54sOwmmuOdxkjMmEJXH2UEchA+vTMps1xw9vL64uwJOWryULg7nA==
12284+
dependencies:
12285+
esbuild "^0.14.27"
12286+
postcss "^8.4.13"
12287+
resolve "^1.22.0"
12288+
rollup ">=2.59.0 <2.78.0"
12289+
optionalDependencies:
12290+
fsevents "~2.3.2"
12291+
1230212292
vite@^3.0.0:
1230312293
version "3.2.4"
1230412294
resolved "https://registry.yarnpkg.com/vite/-/vite-3.2.4.tgz#d8c7892dd4268064e04fffbe7d866207dd24166e"

0 commit comments

Comments
 (0)