Skip to content

Commit 695fb5a

Browse files
committed
tool-versions it is
1 parent e450ab9 commit 695fb5a

File tree

8 files changed

+51
-10
lines changed

8 files changed

+51
-10
lines changed

.github/workflows/frontend.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup Node.js
1818
uses: actions/setup-node@v4
1919
with:
20-
node-version: "20"
20+
node-version-file: '.tool-versions'
2121
cache: "npm"
2222
cache-dependency-path: frontend/package-lock.json
2323

@@ -51,13 +51,14 @@ jobs:
5151
- name: Setup Node.js
5252
uses: actions/setup-node@v4
5353
with:
54-
node-version: "20"
54+
node-version-file: '.tool-versions'
5555
cache: "npm"
5656
cache-dependency-path: frontend/package-lock.json
5757

5858
- name: Setup Ruby
5959
uses: ruby/setup-ruby@v1
6060
with:
61+
ruby-version-file: '.tool-versions'
6162
bundler-cache: true
6263

6364
- name: Install dependencies

.github/workflows/test_build_push.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616

1717
- uses: ruby/setup-ruby@v1
1818
with:
19+
ruby-version-file: '.tool-versions'
1920
bundler-cache: true
2021

2122
- run: bundle exec rubocop -F
@@ -29,13 +30,14 @@ jobs:
2930
- name: Setup Node.js
3031
uses: actions/setup-node@v4
3132
with:
32-
node-version: "20"
33+
node-version-file: '.tool-versions'
3334
cache: "npm"
3435
cache-dependency-path: frontend/package-lock.json
3536

3637
- name: Setup Ruby
3738
uses: ruby/setup-ruby@v1
3839
with:
40+
ruby-version-file: '.tool-versions'
3941
bundler-cache: true
4042

4143
- name: Install dependencies
@@ -68,6 +70,7 @@ jobs:
6870

6971
- uses: ruby/setup-ruby@v1
7072
with:
73+
ruby-version-file: '.tool-versions'
7174
bundler-cache: true
7275

7376
- run: bundle exec rspec
@@ -79,11 +82,12 @@ jobs:
7982
- uses: actions/checkout@v5
8083
- uses: ruby/setup-ruby@v1
8184
with:
85+
ruby-version-file: '.tool-versions'
8286
bundler-cache: true
8387
- name: Setup Node.js for Docker build
8488
uses: actions/setup-node@v4
8589
with:
86-
node-version: "20"
90+
node-version-file: '.tool-versions'
8791
cache: "npm"
8892
cache-dependency-path: frontend/package-lock.json
8993
- name: Install frontend dependencies
@@ -118,7 +122,7 @@ jobs:
118122
- name: Setup Node.js for Docker build
119123
uses: actions/setup-node@v4
120124
with:
121-
node-version: "20"
125+
node-version-file: '.tool-versions'
122126
cache: "npm"
123127
cache-dependency-path: frontend/package-lock.json
124128

.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

.tool-versions

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
ruby 3.4.1
1+
ruby 3.4.6
2+
nodejs 22.19.0

.vscode/extensions.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"recommendations": [
3+
"redhat.vscode-yaml",
4+
"esbenp.prettier-vscode",
5+
"github.copilot",
6+
"github.copilot-chat",
7+
"shopify.ruby-lsp"
8+
]
9+
}

.vscode/settings.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"files.associations": {
3+
"*.yml": "yaml",
4+
"*.yaml": "yaml",
5+
"Rakefile": "ruby",
6+
"Gemfile": "ruby",
7+
"gemspec": "ruby"
8+
},
9+
"editor.formatOnSave": true,
10+
"editor.codeActionsOnSave": {
11+
"source.fixAll.rubocop": "explicit"
12+
},
13+
"search.exclude": {
14+
"**/coverage": true,
15+
"**/tmp": true,
16+
"**/vendor": true,
17+
"**/.git": true,
18+
"**/node_modules": true
19+
},
20+
"files.exclude": {
21+
"**/coverage": true,
22+
"**/tmp": true
23+
},
24+
}

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Stage 1: Frontend Build
2-
FROM node:20-alpine AS frontend-builder
2+
FROM node:22-alpine AS frontend-builder
33

44
WORKDIR /app/frontend
55
COPY frontend/package*.json ./
@@ -8,7 +8,7 @@ COPY frontend/ ./
88
RUN npm run build
99

1010
# Stage 2: Ruby Build
11-
FROM ruby:3.4.5-alpine3.21 AS builder
11+
FROM ruby:3.4.6-alpine3.21 AS builder
1212

1313
LABEL maintainer="Gil Desmarais <[email protected]>"
1414

@@ -32,7 +32,7 @@ RUN apk add --no-cache \
3232
&& bundle binstubs bundler html2rss
3333

3434
# Stage 3: Runtime
35-
FROM ruby:3.4.5-alpine3.21
35+
FROM ruby:3.4.6-alpine3.21
3636

3737
LABEL maintainer="Gil Desmarais <[email protected]>"
3838

frontend/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"name": "html2rss-frontend",
33
"type": "module",
4+
"engines": {
5+
"node": ">=22.0.0"
6+
},
47
"scripts": {
58
"dev": "astro dev --port 3001 --host",
69
"build": "astro build",

0 commit comments

Comments
 (0)