Skip to content

Commit 4ee842a

Browse files
salmad3salmad3
authored
Merge branch 'main' into feat/about-page-redesign
2 parents 24b5637 + 034ba10 commit 4ee842a

Some content is hidden

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

75 files changed

+4173
-10693
lines changed

‎.dockerignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22
**/node_modules
33
**/dist
44
**/dist/*
5-
**/fly*.toml

‎.github/workflows/frontend-build.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,16 @@ jobs:
3030

3131
steps:
3232
- name: Checkout code
33-
uses: actions/checkout@v3
34-
35-
- name: Install pnpm with npm
36-
run: npm install -g pnpm
33+
uses: actions/checkout@v4
3734

38-
- uses: actions/setup-node@v4
35+
- name: Setup Bun
36+
uses: oven-sh/setup-bun@v2
3937
with:
40-
node-version-file: .nvmrc
41-
cache: pnpm
38+
bun-version: 1.3.2
4239

43-
- name: Install dependencies with pnpm
44-
run: pnpm install
40+
- name: Install dependencies
41+
run: bun install
4542

4643
- name: Verify Build
4744
working-directory: ./packages/frontend-main
48-
run: pnpm build
45+
run: bun run build

‎.github/workflows/lint.yml‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,15 @@ jobs:
1212

1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

17-
- name: Install pnpm with npm
18-
run: npm install -g pnpm
19-
20-
- uses: actions/setup-node@v4
17+
- name: Setup Bun
18+
uses: oven-sh/setup-bun@v2
2119
with:
22-
node-version-file: .nvmrc
23-
cache: pnpm
20+
bun-version: 1.3.2
2421

25-
- name: Install dependencies with pnpm
26-
run: pnpm install
22+
- name: Install dependencies
23+
run: bun install
2724

2825
- name: Lint
29-
run: pnpm run lint
26+
run: bun run lint

‎.github/workflows/mainnet-api-main.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,3 @@ jobs:
6969
🔍 [View Logs](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
7070
7171
Please investigate and fix *ASAP*! 🔧
72-
73-
smoke-tests:
74-
needs: [build]
75-
if: needs.deploy-mainnet.result == 'success'
76-
uses: ./.github/workflows/smoke-tests.yml
77-
secrets: inherit
78-
with:
79-
app_name: dither-mainnet-api-main

‎.github/workflows/npm-publish.yml‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,29 +18,31 @@ jobs:
1818
- name: Checkout repository
1919
uses: actions/checkout@v4
2020

21-
- name: Set up Node.js
21+
- name: Setup Bun
22+
uses: oven-sh/setup-bun@v2
23+
with:
24+
bun-version: 1.3.2
25+
26+
- name: Set up Node.js for NPM publish
2227
uses: actions/setup-node@v4
2328
with:
2429
node-version: 20
2530
registry-url: 'https://registry.npmjs.org/'
26-
scope: '@atomone'
27-
28-
- name: Install pnpm
29-
run: npm install -g pnpm
31+
scope: '@dither.chat'
3032

3133
- name: Install dependencies
3234
run: |
3335
cd ./packages/${{ github.event.inputs.package }}
34-
pnpm install
36+
bun install
3537
3638
- name: Build package
3739
run: |
3840
cd ./packages/${{ github.event.inputs.package }}
39-
pnpm run build
41+
bun run build
4042
4143
- name: Publish to NPM
4244
env:
4345
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
4446
run: |
4547
cd ./packages/${{ github.event.inputs.package }}
46-
pnpm publish --access public --no-git-checks
48+
bun publish --access public --no-git-checks

‎.github/workflows/smoke-tests.yml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,19 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616

17-
- name: Install pnpm with npm
18-
run: npm install -g pnpm
19-
20-
- uses: actions/setup-node@v4
17+
- name: Setup Bun
18+
uses: oven-sh/setup-bun@v2
2119
with:
22-
node-version-file: .nvmrc
23-
cache: pnpm
24-
25-
- name: Install dependencies with pnpm
26-
run: pnpm install
20+
bun-version: 1.3.2
2721

28-
- name: Build dependencies
29-
working-directory: packages/api-main
30-
run: pnpm run build:deps
22+
- name: Install dependencies
23+
run: bun install
3124

3225
- name: Run tests
3326
working-directory: packages/api-main
34-
run: pnpm run test:smoke
27+
run: bun run test:smoke
3528
env:
3629
APP_NAME: ${{ inputs.app_name }}
3730

‎.github/workflows/test.yml‎

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,25 @@ jobs:
2929
3030
steps:
3131
- name: Checkout code
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333

34-
- name: Install pnpm with npm
35-
run: npm install -g pnpm
36-
37-
- uses: actions/setup-node@v4
34+
- name: Setup Bun
35+
uses: oven-sh/setup-bun@v2
3836
with:
39-
node-version-file: .nvmrc
40-
cache: pnpm
41-
42-
- name: Install dependencies with pnpm
43-
run: pnpm install
37+
bun-version: 1.3.2
4438

45-
- name: Build dependencies
46-
working-directory: packages/api-main
47-
run: pnpm build:deps
39+
- name: Install dependencies
40+
run: bun install
4841

4942
- name: Setup database schema
5043
working-directory: packages/api-main
51-
run: pnpm db:push:force
44+
run: bun run db:push:force
5245
env:
5346
PG_URI: postgresql://default:password@localhost:5432/postgres
5447

5548
- name: Run tests
5649
working-directory: packages/api-main
57-
run: pnpm test
50+
run: bun run test
5851
env:
5952
NODE_OPTIONS: --experimental-global-webcrypto
6053
PG_URI: postgresql://default:password@localhost:5432/postgres

‎.github/workflows/testnet-api-main.yml‎

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,43 +32,48 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout code
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636

37-
- name: Install pnpm with npm
38-
run: npm install -g pnpm
37+
- name: Setup Bun
38+
uses: oven-sh/setup-bun@v2
39+
with:
40+
bun-version: 1.3.2
3941

4042
- name: Create Directory
4143
run: mkdir -p ./packages/api-main/data/postgres_data
4244

43-
- name: Setup Node.js
44-
uses: actions/setup-node@v4
45-
with:
46-
node-version-file: .nvmrc
47-
cache: pnpm
48-
49-
- name: Install dependencies with pnpm
50-
run: pnpm install
45+
- name: Install dependencies
46+
run: bun install
5147

5248
- name: Set up Docker
5349
uses: docker/setup-docker-action@v4
5450

55-
- name: Build API Types
56-
working-directory: ./packages/lib-api-types
57-
run: pnpm build
58-
5951
- name: Run Docker Compose Up
6052
working-directory: ./packages/api-main
6153
run: docker compose -f ./docker-compose-github.yml up --build -d --wait --wait-timeout 30
6254

63-
- name: Push database migrations
55+
- name: Wait for database to be ready
6456
working-directory: ./packages/api-main
6557
run: |
66-
cp .env.example .env
67-
pnpm db:push:force
58+
until docker exec postgres_db pg_isready -U default; do
59+
sleep 1
60+
done
61+
62+
- name: Push database migrations
63+
working-directory: ./packages/api-main
64+
run: bun run db:push:force
65+
env:
66+
PG_URI: postgresql://default:password@localhost:5432/postgres
6867

69-
- name: Run tests with pnpm
68+
- name: Run tests
7069
working-directory: ./packages/api-main
71-
run: pnpm test
70+
run: bun run test
71+
env:
72+
NODE_OPTIONS: --experimental-global-webcrypto
73+
PG_URI: postgresql://default:password@localhost:5432/postgres
74+
JWT: default_jwt_secret
75+
JWT_STRICTNESS: lax
76+
AUTH: whatever
7277

7378
build:
7479
needs: [detect-changes, test]
@@ -114,7 +119,7 @@ jobs:
114119

115120
notify:
116121
needs: [build]
117-
if: failure()
122+
if: failure() && needs.build.result != 'skipped'
118123
runs-on: ubuntu-latest
119124
steps:
120125
- uses: appleboy/telegram-action@v1.0.1

‎.github/workflows/testnet-feed-sync.yml‎

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

7171
notify:
7272
needs: [build]
73-
if: failure()
73+
if: failure() && needs.build.result != 'skipped'
7474
runs-on: ubuntu-latest
7575
steps:
7676
- uses: appleboy/telegram-action@v1.0.1

‎.github/workflows/testnet-reader-main.yml‎

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

7171
notify:
7272
needs: [build]
73-
if: failure()
73+
if: failure() && needs.build.result != 'skipped'
7474
runs-on: ubuntu-latest
7575
steps:
7676
- uses: appleboy/telegram-action@v1.0.1

0 commit comments

Comments
 (0)