Skip to content

Commit d696735

Browse files
committed
Update CI and script paths to use clients/
1 parent b074d1b commit d696735

6 files changed

Lines changed: 31 additions & 26 deletions

File tree

.dockerignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ node_modules
77
npm-debug.log
88

99
# Build artifacts
10-
web/dist
11-
cli/build
12-
tui/build
10+
clients/web/dist
11+
clients/cli/build
12+
clients/tui/build
1313

1414
# Environment variables
1515
.env

.github/workflows/cli_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ name: CLI Tests
33
on:
44
push:
55
paths:
6-
- "cli/**"
6+
- "clients/cli/**"
77
pull_request:
88
paths:
9-
- "cli/**"
9+
- "clients/cli/**"
1010

1111
jobs:
1212
test:
1313
runs-on: ubuntu-latest
1414
defaults:
1515
run:
16-
working-directory: ./cli
16+
working-directory: ./clients/cli
1717
steps:
1818
- uses: actions/checkout@v6
1919

.github/workflows/e2e_tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,17 @@ jobs:
5656
with:
5757
name: playwright-report
5858
path: |
59-
web/playwright-report/
60-
web/test-results/
61-
web/results.json
59+
clients/web/playwright-report/
60+
clients/web/test-results/
61+
clients/web/results.json
6262
retention-days: 2
6363

6464
- name: Publish Playwright Test Summary
6565
uses: daun/playwright-report-summary@v3
6666
if: steps.playwright-tests.conclusion != 'skipped'
6767
with:
6868
create-comment: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
69-
report-file: web/results.json
69+
report-file: clients/web/results.json
7070
comment-title: "🎭 Playwright E2E Test Results"
7171
job-summary: true
7272
icon-style: "emojis"

Dockerfile

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ WORKDIR /app
77
# Copy package files for installation
88
COPY package*.json ./
99
COPY .npmrc ./
10-
COPY web/package*.json ./web/
10+
COPY clients/web/package*.json ./clients/web/
1111
COPY core/package*.json ./core/
12-
COPY cli/package*.json ./cli/
13-
COPY tui/package*.json ./tui/
12+
COPY clients/cli/package*.json ./clients/cli/
13+
COPY clients/tui/package*.json ./clients/tui/
14+
COPY clients/launcher/package*.json ./clients/launcher/
1415

1516
# Install dependencies
1617
RUN npm ci --ignore-scripts
@@ -29,22 +30,24 @@ WORKDIR /app
2930
# Copy package files for production
3031
COPY package*.json ./
3132
COPY .npmrc ./
32-
COPY web/package*.json ./web/
33+
COPY clients/web/package*.json ./clients/web/
3334
COPY core/package*.json ./core/
34-
COPY cli/package*.json ./cli/
35-
COPY tui/package*.json ./tui/
35+
COPY clients/cli/package*.json ./clients/cli/
36+
COPY clients/tui/package*.json ./clients/tui/
37+
COPY clients/launcher/package*.json ./clients/launcher/
3638

3739
# Install only production dependencies
3840
RUN npm ci --omit=dev --ignore-scripts
3941

4042
# Copy built files from builder stage
41-
COPY --from=builder /app/web/dist ./web/dist
42-
COPY --from=builder /app/web/build ./web/build
43-
COPY --from=builder /app/cli/build ./cli/build
43+
COPY --from=builder /app/clients/web/dist ./clients/web/dist
44+
COPY --from=builder /app/clients/web/build ./clients/web/build
45+
COPY --from=builder /app/clients/cli/build ./clients/cli/build
46+
COPY --from=builder /app/clients/launcher/build ./clients/launcher/build
4447

4548
# Set default port
4649
ENV PORT=6274
4750
EXPOSE ${PORT}
4851

4952
# Run web app
50-
CMD ["node", "web/build/index.js"]
53+
CMD ["node", "clients/launcher/build/index.js", "--web"]

scripts/check-version-consistency.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ console.log("🔍 Checking version consistency across packages...\n");
1818
// List of package.json files to check
1919
const packagePaths = [
2020
"package.json",
21-
"web/package.json",
21+
"clients/web/package.json",
2222
"core/package.json",
23-
"cli/package.json",
24-
"tui/package.json",
23+
"clients/cli/package.json",
24+
"clients/tui/package.json",
25+
"clients/launcher/package.json",
2526
"test-servers/package.json",
2627
];
2728

scripts/update-version.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ console.log(`🔄 Updating all packages to version ${newVersion}...`);
3737
// List of package.json files to update
3838
const packagePaths = [
3939
"package.json",
40-
"web/package.json",
40+
"clients/web/package.json",
4141
"core/package.json",
42-
"cli/package.json",
43-
"tui/package.json",
42+
"clients/cli/package.json",
43+
"clients/tui/package.json",
44+
"clients/launcher/package.json",
4445
"test-servers/package.json",
4546
];
4647

0 commit comments

Comments
 (0)