Skip to content

Commit ec6673b

Browse files
gildesmaraisgildesmarais
authored
fix(ci): repair Ruby, OpenAPI, and frontend checks (#880)
## Summary - fix Ruby CI by preventing RuboCop from traversing vendored Bundler gems - repair OpenAPI verification and linting by generating valid string examples for feed error responses - align frontend unit and Playwright smoke tests with the current feed result and inline access-token UI - keep the earlier cleanup of stale Astro-era files, tmp ignores, and outdated devcontainer/docs references ## Testing - docker compose -f .devcontainer/docker-compose.yml exec -T app make ready - docker compose -f .devcontainer/docker-compose.yml exec -T app make openapi-lint - docker compose -f .devcontainer/docker-compose.yml exec -T app sh -lc 'cd frontend && npm run test:ci' - manual browser verification with chrome-devtools at http://127.0.0.1:4001/ for guest and access-token-gate states ## Notes - local Playwright execution in this ARM dev container is blocked by a browser-launch environment issue, but the smoke flow selectors were verified against the running app in-browser
1 parent 62828d5 commit ec6673b

19 files changed

Lines changed: 103 additions & 87 deletions

File tree

‎.cursor/rules/read-copilot-instructions.mdc‎

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

‎.devcontainer/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Containers extension) or GitHub Codespaces and use that environment for all work
88
The devcontainer starts one service named `app` and exposes:
99

1010
- **Port 4000:** Ruby app
11-
- **Port 4001:** Astro dev server
11+
- **Port 4001:** Vite dev server
1212

1313
The repo is mounted at `/workspace`. Bundler gems are cached in a Docker volume to speed up
1414
future launches.
@@ -29,9 +29,9 @@ network access is available.
2929
## Common commands (run inside the container)
3030

3131
```
32-
make dev # Ruby + Astro
32+
make dev # Ruby + Vite
3333
make dev-ruby # Ruby only
34-
make dev-frontend # Astro only
34+
make dev-frontend # frontend only
3535
make test # Ruby + frontend tests
3636
make ready # RuboCop + RSpec (pre-commit gate)
3737
```

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626

2727
- uses: ruby/setup-ruby@v1
2828
with:
29-
ruby-version-file: ".tool-versions"
3029
bundler-cache: true
3130

3231
- name: Run RuboCop
@@ -53,7 +52,6 @@ jobs:
5352

5453
- uses: ruby/setup-ruby@v1
5554
with:
56-
ruby-version-file: ".tool-versions"
5755
bundler-cache: true
5856

5957
- name: Setup Node.js for OpenAPI lint tooling
@@ -106,42 +104,56 @@ jobs:
106104
- name: Run frontend smoke test
107105
run: npm run test:e2e
108106

109-
docker-test:
107+
docker-build-smoke-image:
110108
needs:
111109
- hadolint
112110
- ruby
113111
- openapi
114112
- frontend
115113
runs-on: ubuntu-latest
114+
steps:
115+
- uses: actions/checkout@v6
116+
117+
- name: Build Docker smoke image
118+
run: docker build -t html2rss/web -f Dockerfile .
119+
120+
- name: Export Docker smoke image
121+
run: docker save html2rss/web -o /tmp/html2rss-web-smoke-image.tar
122+
123+
- name: Upload Docker smoke image
124+
uses: actions/upload-artifact@v4
125+
with:
126+
name: docker-smoke-image
127+
path: /tmp/html2rss-web-smoke-image.tar
128+
retention-days: 1
129+
130+
docker-test:
131+
needs:
132+
- docker-build-smoke-image
133+
runs-on: ubuntu-latest
116134
strategy:
117135
fail-fast: false
118136
matrix:
119137
smoke_auto_source_enabled: ["false", "true"]
120138
steps:
121-
- uses: actions/checkout@v5
139+
- uses: actions/checkout@v6
122140

123141
- uses: ruby/setup-ruby@v1
124142
with:
125-
ruby-version-file: ".tool-versions"
126143
bundler-cache: true
127144

128-
- name: Setup Node.js for Docker smoke test
129-
uses: actions/setup-node@v4
145+
- name: Download Docker smoke image
146+
uses: actions/download-artifact@v4
130147
with:
131-
node-version-file: ".tool-versions"
132-
cache: npm
133-
cache-dependency-path: frontend/package-lock.json
134-
135-
- name: Install frontend dependencies
136-
run: npm ci
137-
working-directory: frontend
148+
name: docker-smoke-image
149+
path: /tmp
138150

139-
- name: Build frontend static assets
140-
run: npm run build
141-
working-directory: frontend
151+
- name: Load Docker smoke image
152+
run: docker load -i /tmp/html2rss-web-smoke-image.tar
142153

143154
- name: Run Docker smoke test
144155
env:
156+
DOCKER_SMOKE_SKIP_BUILD: "true"
145157
SMOKE_AUTO_SOURCE_ENABLED: ${{ matrix.smoke_auto_source_enabled }}
146158
run: bundle exec rake
147159

‎.gitignore‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@
3636
/tmp/rack-cache-*
3737

3838

39-
# Ignore Astro frontend build output
39+
# Ignore frontend build output and tooling caches
4040
/frontend/dist/
41-
/frontend/.astro/
4241
/frontend/node_modules/
4342
/public/frontend
4443
/frontend/playwright-report/
@@ -51,4 +50,8 @@
5150
# Frontend logs
5251
*.log
5352

53+
# macOS Finder metadata
54+
.DS_Store
55+
5456
.yardoc
57+
frontend/.astro

‎.redocly.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
extends:
2+
- recommended
3+
4+
rules:
5+
operation-4xx-response: off

‎.rubocop.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ AllCops:
1111
- '**/*.yml'
1212
- '**/*.yaml'
1313
- '**/.tool-versions'
14+
- 'coverage/**/*'
15+
- 'frontend/node_modules/**/*'
16+
- 'frontend/test-results/**/*'
17+
- 'public/frontend/**/*'
18+
- 'tmp/**/*'
19+
- 'vendor/**/*'
1420

1521
Layout/LineLength:
1622
Max: 120

‎Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ ARG UID=991
5555
ARG GID=991
5656

5757
RUN apk add --no-cache \
58+
'ca-certificates>=2024' \
5859
'curl>=8' \
5960
'gcompat>=0' \
6061
'tzdata>=2024' \

‎Rakefile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,21 @@ task :test do
4747
current_dir = ENV.fetch('GITHUB_WORKSPACE', __dir__)
4848
smoke_auto_source_enabled = ENV.fetch('SMOKE_AUTO_SOURCE_ENABLED', 'false')
4949
image_name = 'html2rss/web'
50+
skip_build = ENV.fetch('DOCKER_SMOKE_SKIP_BUILD', 'false') == 'true'
51+
52+
if skip_build
53+
Output.describe 'Running with prebuilt docker image'
54+
else
55+
Output.describe 'Building and running'
56+
sh "docker build -t #{image_name} -f Dockerfile ."
57+
end
5058

51-
Output.describe 'Building and running'
52-
sh "docker build -t #{image_name} -f Dockerfile ."
5359
sh ['docker run',
5460
'-d',
5561
'-p 4000:4000',
5662
'--env PUMA_LOG_CONFIG=1',
5763
'--env HEALTH_CHECK_TOKEN=CHANGE_ME_HEALTH_CHECK_TOKEN',
64+
'--env HTML2RSS_SECRET_KEY=0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef',
5865
"--env AUTO_SOURCE_ENABLED=#{smoke_auto_source_enabled}",
5966
"--mount type=bind,source=#{current_dir}/config,target=/app/config",
6067
'--name html2rss-web-test',

‎app.json‎

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

‎bin/dev-with-frontend‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export RACK_ENV=${RACK_ENV:-development}
1515
echo "Starting html2rss-web development environment..."
1616
echo "Environment: $RACK_ENV"
1717
echo "Ruby server: http://localhost:4000"
18-
echo "Astro dev server: http://localhost:4001 (with live reload)"
18+
echo "Vite dev server: http://localhost:4001 (with live reload)"
1919
echo "Main development URL: http://localhost:4001"
2020
echo ""
2121

@@ -24,10 +24,10 @@ cleanup() {
2424
echo ""
2525
echo "Shutting down servers..."
2626
kill $RUBY_PID 2>/dev/null || true
27-
kill $ASTRO_PID 2>/dev/null || true
27+
kill $FRONTEND_PID 2>/dev/null || true
2828
kill $WATCHER_PID 2>/dev/null || true
2929
wait $RUBY_PID 2>/dev/null || true
30-
wait $ASTRO_PID 2>/dev/null || true
30+
wait $FRONTEND_PID 2>/dev/null || true
3131
wait $WATCHER_PID 2>/dev/null || true
3232
echo "Servers stopped."
3333
exit 0
@@ -44,16 +44,16 @@ RUBY_PID=$!
4444
# Wait a moment for Ruby server to start
4545
sleep 3
4646

47-
# Start Astro dev server with API proxy
48-
echo "Starting Astro dev server with API proxy..."
47+
# Start frontend dev server with API proxy
48+
echo "Starting frontend dev server with API proxy..."
4949
cd frontend
5050

51-
# Start Astro dev server (it will proxy API calls to Ruby server)
51+
# Start frontend dev server (it will proxy API calls to Ruby server)
5252
npm run dev &
53-
ASTRO_PID=$!
53+
FRONTEND_PID=$!
5454

55-
# Wait a moment for Astro server to start
55+
# Wait a moment for the frontend server to start
5656
sleep 3
5757

5858
# Wait for both processes
59-
wait $RUBY_PID $ASTRO_PID
59+
wait $RUBY_PID $FRONTEND_PID

0 commit comments

Comments
 (0)