Skip to content

Commit 71ea60f

Browse files
committed
Add comments etc
1 parent 72d418c commit 71ea60f

File tree

5 files changed

+40
-17
lines changed

5 files changed

+40
-17
lines changed

.github/workflows/chromatic.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,20 @@ jobs:
2020

2121
runs-on: ubuntu-latest
2222

23+
environment:
24+
name: development
25+
2326
steps:
2427
- uses: actions/checkout@v4
2528
with:
2629
fetch-depth: 2 # we need to fetch at least parent commit to satisfy Chromatic
2730
ref: ${{ github.event.pull_request.head.sha || github.sha }} # HEAD commit instead of merge commit
2831

32+
# Storybook with submodules
33+
- uses: ./.github/actions/submodules-checkout
34+
with:
35+
submodules-ssh-key: ${{ secrets.PRIVATE_GITHUB_DEPLOY_TOKEN }}
36+
2937
- uses: ./.github/actions/ci-setup
3038

3139
- name: Chromatic

.github/workflows/cli-r2-static.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
with:
3131
ref: ${{ github.sha }} # HEAD commit instead of merge commit
3232

33+
# Do not checkout submodules, they are not needed for this workflow
34+
3335
- uses: pnpm/action-setup@v4
3436

3537
- uses: actions/setup-node@v4

.github/workflows/cli-r2.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ jobs:
3131
with:
3232
ref: ${{ github.sha }} # HEAD commit instead of merge commit
3333

34+
# We need submodules here as this is used for the cloudflare build
35+
- uses: ./.github/actions/submodules-checkout
36+
with:
37+
submodules-ssh-key: ${{ secrets.PRIVATE_GITHUB_DEPLOY_TOKEN }}
38+
3439
- uses: pnpm/action-setup@v4
3540

3641
- uses: actions/setup-node@v4

.github/workflows/fixtures-test.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,7 @@ jobs:
4242
- uses: actions/checkout@v4
4343
with:
4444
ref: ${{ github.event.pull_request.head.sha || github.sha }}
45-
46-
- run: |
47-
echo "Secrets available: ${{ secrets.PRIVATE_GITHUB_DEPLOY_TOKEN != '' }}"
48-
45+
# Test that everything is working with submodules
4946
- uses: ./.github/actions/submodules-checkout
5047
with:
5148
submodules-ssh-key: ${{ secrets.PRIVATE_GITHUB_DEPLOY_TOKEN }}

.github/workflows/main.yml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,14 @@ jobs:
1818
checks:
1919
timeout-minutes: 20
2020

21+
strategy:
22+
matrix:
23+
environment:
24+
- empty
25+
- development
26+
2127
environment:
22-
name: development
28+
name: ${{ matrix.environment }}
2329

2430
env:
2531
DATABASE_URL: postgres://
@@ -32,6 +38,11 @@ jobs:
3238
with:
3339
ref: ${{ github.event.pull_request.head.sha || github.sha }}
3440

41+
# Will not checkout submodules on empty environment, and will on development
42+
- uses: ./.github/actions/submodules-checkout
43+
with:
44+
submodules-ssh-key: ${{ secrets.PRIVATE_GITHUB_DEPLOY_TOKEN }}
45+
3546
- uses: ./.github/actions/ci-setup
3647

3748
- uses: actions/cache@v4
@@ -44,23 +55,23 @@ jobs:
4455

4556
- run: echo ===SHA USED=== ${{ github.event.pull_request.head.sha || github.sha }} # todo: remove after check whats happening on main
4657

47-
- run: pnpm prettier --cache --check "**/*.{js,md,ts,tsx}"
48-
49-
- run: pnpm lint --cache --cache-strategy=content --cache-location=node_modules/.cache/eslint/.eslint-cache
58+
- run: |
59+
pnpm prettier --cache --check "**/*.{js,md,ts,tsx}"
5060
51-
- run: pnpm -r test
52-
- run: pnpm --filter=@webstudio-is/prisma-client build
53-
- run: pnpm -r typecheck
61+
- name: Lint
62+
run: |
63+
pnpm lint --cache --cache-strategy=content --cache-location=node_modules/.cache/eslint/.eslint-cache
5464
55-
- uses: ./.github/actions/submodules-checkout
56-
with:
57-
submodules-ssh-key: ${{ secrets.PRIVATE_GITHUB_DEPLOY_TOKEN }}
65+
- name: Test
66+
run: |
67+
pnpm -r test
5868
59-
- run: |
60-
pnpm -r --filter='sdk-components-animation' typecheck
69+
- name: Typecheck
70+
run: |
71+
pnpm -r typecheck
6172
6273
check-size:
63-
runs-on: ubuntu-latest
74+
runs-on: ubuntu-24.04-arm
6475

6576
environment:
6677
name: development

0 commit comments

Comments
 (0)