Skip to content

Commit 9936712

Browse files
committed
Simplify CI
1 parent 1e5644d commit 9936712

File tree

5 files changed

+43
-46
lines changed

5 files changed

+43
-46
lines changed

β€Ž.github/actions/pnpm-install/action.yamlβ€Ž

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

β€Ž.github/workflows/check-migration.yamlβ€Ž

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,27 +29,37 @@ jobs:
2929
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
3030

3131
steps:
32-
- name: Checkout main
32+
- name: πŸ” Checkout main branch
3333
uses: actions/checkout@v4
3434
with:
3535
ref: main
3636

37-
- name: Install dependencies
38-
uses: ./.github/actions/pnpm-install
37+
- name: πŸ“¦ Setup pnpm
38+
uses: pnpm/action-setup@v4
3939

40-
- name: Apply migrations (main)
40+
- name: 🐒 Setup node
41+
uses: actions/setup-node@v4
42+
with:
43+
node-version: 20
44+
cache: pnpm
45+
cache-dependency-path: ./pnpm-lock.yaml
46+
47+
- name: πŸ“¦ Install dependencies
48+
run: pnpm install --frozen-lockfile
49+
50+
- name: πŸ—οΈ Apply migrations (main)
4151
run: pnpm db:migrate
4252

43-
- name: Checkout PR branch
53+
- name: πŸ” Checkout PR branch
4454
uses: actions/checkout@v4
4555
with:
4656
ref: ${{ github.head_ref }}
4757

48-
- name: Install dependencies
49-
uses: ./.github/actions/pnpm-install
58+
- name: πŸ“¦ Install dependencies
59+
run: pnpm install --frozen-lockfile
5060

51-
- name: Check migrations (PR Branch)
61+
- name: 🩺 Check migrations (PR Branch)
5262
run: pnpm db:check
5363

54-
- name: Apply migrations (PR Branch)
64+
- name: 🚒 Apply migrations (PR Branch)
5565
run: pnpm db:migrate

β€Ž.github/workflows/ci.yamlβ€Ž

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,18 @@ jobs:
4141
- name: πŸ” Checkout
4242
uses: actions/checkout@v4
4343

44-
- name: 🚚 Install dependencies
45-
uses: ./.github/actions/pnpm-install
44+
- name: πŸ“¦ Setup pnpm
45+
uses: pnpm/action-setup@v4
46+
47+
- name: 🐒 Setup node
48+
uses: actions/setup-node@v4
49+
with:
50+
node-version: 20
51+
cache: pnpm
52+
cache-dependency-path: ./pnpm-lock.yaml
53+
54+
- name: πŸ“¦ Install dependencies
55+
run: pnpm install --frozen-lockfile
4656

4757
- name: πŸ—οΈ Migrate database
4858
run: pnpm db:migrate

β€Ž.github/workflows/deploy.yamlβ€Ž

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,18 @@ jobs:
1313
- name: πŸ” Checkout
1414
uses: actions/checkout@v4
1515

16+
- name: πŸ“¦ Setup pnpm
17+
uses: pnpm/action-setup@v4
18+
19+
- name: 🐒 Setup node
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: 20
23+
cache: pnpm
24+
cache-dependency-path: ./pnpm-lock.yaml
25+
1626
- name: πŸ“¦ Install dependencies
17-
uses: ./.github/actions/pnpm-install
27+
run: pnpm install --frozen-lockfile
1828

1929
- name: πŸͺ° Setup Fly
2030
uses: superfly/flyctl-actions/setup-flyctl@master

β€Žapps/api/fly.tomlβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ primary_region = "arn"
1414
[[vm]]
1515
size = "shared-cpu-2x"
1616
memory = "1gb"
17-
cpus = 4
17+
cpus = 1

0 commit comments

Comments
Β (0)