Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions .devcontainer/Dockerfile

This file was deleted.

49 changes: 0 additions & 49 deletions .devcontainer/README.md

This file was deleted.

44 changes: 0 additions & 44 deletions .devcontainer/devcontainer.json

This file was deleted.

22 changes: 0 additions & 22 deletions .devcontainer/docker-compose.yml

This file was deleted.

6 changes: 1 addition & 5 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,19 @@
.mergify.yml
.rspec
.rubocop.yml
.ruby-version
.ruby-lsp/
.yardoc/
app.json
bin/
!bin/docker-healthcheck
coverage/
docs/
Dockerfile
Procfile
Dockerfile.dev
Rakefile
renovate.json
spec/
tmp/
work/
frontend/dist/
frontend/node_modules/
frontend/test-results/
frontend/.astro/

4 changes: 4 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ updates:
interval: daily
time: "09:00"
open-pull-requests-limit: 10
groups:
docker:
patterns:
- "*"

- package-ecosystem: github-actions
directory: "/"
Expand Down
12 changes: 11 additions & 1 deletion .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,19 @@ jobs:
fi
echo "TARGET_VERSION=${version}" >> "$GITHUB_ENV"

- name: Read toolchain versions from Dockerfile
id: toolchain
run: |
ruby_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? ruby:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
node_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? node:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
test -n "$ruby_version" && test -n "$node_version"
echo "ruby=$ruby_version" >> "$GITHUB_OUTPUT"
echo "node=$node_version" >> "$GITHUB_OUTPUT"

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ steps.toolchain.outputs.ruby }}
bundler-cache: true

- name: Setup pnpm
Expand All @@ -57,7 +67,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v7
with:
node-version-file: ".tool-versions"
node-version: ${{ steps.toolchain.outputs.node }}

- name: Install frontend dependencies
run: pnpm install --frozen-lockfile
Expand Down
62 changes: 56 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
- uses: actions/checkout@v7
- name: Lint Dockerfile
run: docker run --rm -i hadolint/hadolint < Dockerfile
- name: Lint Dockerfile.dev
run: docker run --rm -i hadolint/hadolint < Dockerfile.dev

compose-contract:
needs:
Expand All @@ -35,8 +37,18 @@ jobs:
steps:
- uses: actions/checkout@v7

- name: Read toolchain versions from Dockerfile
id: toolchain
run: |
ruby_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? ruby:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
node_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? node:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
test -n "$ruby_version" && test -n "$node_version"
echo "ruby=$ruby_version" >> "$GITHUB_OUTPUT"
echo "node=$node_version" >> "$GITHUB_OUTPUT"

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ steps.toolchain.outputs.ruby }}
bundler-cache: true

- name: Run RuboCop
Expand All @@ -61,8 +73,18 @@ jobs:
steps:
- uses: actions/checkout@v7

- name: Read toolchain versions from Dockerfile
id: toolchain
run: |
ruby_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? ruby:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
node_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? node:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
test -n "$ruby_version" && test -n "$node_version"
echo "ruby=$ruby_version" >> "$GITHUB_OUTPUT"
echo "node=$node_version" >> "$GITHUB_OUTPUT"

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ steps.toolchain.outputs.ruby }}
bundler-cache: true

- name: Setup pnpm
Expand All @@ -75,7 +97,7 @@ jobs:
- name: Setup Node.js for OpenAPI lint tooling
uses: actions/setup-node@v7
with:
node-version-file: ".tool-versions"
node-version: ${{ steps.toolchain.outputs.node }}

- name: Install frontend dependencies for OpenAPI client verification
run: pnpm install --frozen-lockfile
Expand All @@ -95,6 +117,15 @@ jobs:
steps:
- uses: actions/checkout@v7

- name: Read toolchain versions from Dockerfile
id: toolchain
run: |
ruby_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? ruby:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
node_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? node:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
test -n "$ruby_version" && test -n "$node_version"
echo "ruby=$ruby_version" >> "$GITHUB_OUTPUT"
echo "node=$node_version" >> "$GITHUB_OUTPUT"

- name: Setup pnpm
uses: pnpm/action-setup@v6.1.0
with:
Expand All @@ -105,7 +136,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v7
with:
node-version-file: ".tool-versions"
node-version: ${{ steps.toolchain.outputs.node }}

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand All @@ -121,6 +152,15 @@ jobs:
steps:
- uses: actions/checkout@v7

- name: Read toolchain versions from Dockerfile
id: toolchain
run: |
ruby_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? ruby:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
node_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? node:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
test -n "$ruby_version" && test -n "$node_version"
echo "ruby=$ruby_version" >> "$GITHUB_OUTPUT"
echo "node=$node_version" >> "$GITHUB_OUTPUT"

- name: Setup pnpm
uses: pnpm/action-setup@v6.1.0
with:
Expand All @@ -131,7 +171,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v7
with:
node-version-file: ".tool-versions"
node-version: ${{ steps.toolchain.outputs.node }}

- name: Install dependencies
run: pnpm install --frozen-lockfile
Expand Down Expand Up @@ -170,8 +210,8 @@ jobs:
context: .
load: true
tags: html2rss/web
cache-from: type=gha
cache-to: type=gha,mode=max
cache-from: type=gha,scope=runtime
cache-to: type=gha,mode=max,scope=runtime

docker-test:
needs:
Expand All @@ -184,8 +224,18 @@ jobs:
steps:
- uses: actions/checkout@v7

- name: Read toolchain versions from Dockerfile
id: toolchain
run: |
ruby_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? ruby:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
node_version=$(sed -nE 's/^FROM( --platform=[^ ]+)? node:([0-9.]+)-alpine.*/\2/p' Dockerfile | head -n 1)
test -n "$ruby_version" && test -n "$node_version"
echo "ruby=$ruby_version" >> "$GITHUB_OUTPUT"
echo "node=$node_version" >> "$GITHUB_OUTPUT"

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ steps.toolchain.outputs.ruby }}
bundler-cache: true

- uses: docker/setup-buildx-action@v4
Expand All @@ -196,7 +246,7 @@ jobs:
context: .
load: true
tags: html2rss/web
cache-from: type=gha
cache-from: type=gha,scope=runtime

- name: Run Docker smoke test
env:
Expand Down
1 change: 0 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ AllCops:
Exclude:
- '**/*.yml'
- '**/*.yaml'
- '**/.tool-versions'
- 'coverage/**/*'
- 'frontend/node_modules/**/*'
- 'frontend/test-results/**/*'
Expand Down
2 changes: 0 additions & 2 deletions .tool-versions

This file was deleted.

1 change: 0 additions & 1 deletion .yardopts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@
--exclude public/
--exclude config/
--exclude bin/
--exclude .devcontainer/
--exclude .github/
Loading
Loading