Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .claude/rules/ruby/ruby-sdl2.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ upstream: https://github.com/ohai/ruby-sdl2.git (オリジナル)

```bash
cd ruby/ruby-sdl2
rbenv local 3.3.9 # or 3.4.9, 4.0.2
rbenv local 3.3.13 # or 3.4.12, 4.0.9 (Regexp CVE fixes, 2026-10)
m4 video.c.m4 > video.c # m4 プリプロセス(.c.m4 ファイル変更時)
ruby extconf.rb && make
```
Expand Down
2 changes: 1 addition & 1 deletion .claude/rules/ruby/smalruby3.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ gem push smalruby3-YY.MR.DDR.gem

## Tech Stack

- **Ruby**: 3.3+ (`rbenv local 3.3.9` が設定済み)
- **Ruby**: 3.3+(`.ruby-version` は 4.0.9。3.3.13 / 3.4.12 / 4.0.9 未満は Regexp の CVE が未修正)
- **SDL2**: ruby-sdl2 gem (0.3.6) + smalruby3 launcher (macOS)
- **並行実行**: Thread + Mutex + Fiber
- メインスレッド: SDL2 イベントループ + 描画
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ permissions:

jobs:
lint:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: no Playwright chromium build yet
if: |
(!(
github.ref == 'refs/heads/develop' ||
Expand All @@ -81,7 +81,7 @@ jobs:
run: npm run lint

unit-test-vm:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: no Playwright chromium build yet
if: |
(!(
github.ref == 'refs/heads/develop' ||
Expand All @@ -104,7 +104,7 @@ jobs:
run: npm run test:unit --workspace=packages/scratch-vm

unit-test-gui:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: no Playwright chromium build yet
if: |
(!(
github.ref == 'refs/heads/develop' ||
Expand All @@ -127,7 +127,7 @@ jobs:
run: npm run test:unit --workspace=packages/scratch-gui

integration-test-vm:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: no Playwright chromium build yet
if: |
(!(
github.ref == 'refs/heads/develop' ||
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
path: packages/scratch-vm/test-results/*

integration-test-gui:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: no Playwright chromium build yet
if: |
(!(
github.ref == 'refs/heads/develop' ||
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
path: packages/scratch-gui/test-results/*

build-and-deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: no Playwright chromium build yet
env:
NODE_OPTIONS: --max-old-space-size=4000
steps:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ jobs:
# ---------------------------------------------------------------------------
ruby-unit-tests:
name: "[mesh-v2] Ruby Unit Tests & Lint"
# ubuntu-latest moved to 26.04, where setup-ruby has no Ruby 3.4.1 yet.
# ubuntu-latest moved to 26.04; keep the mesh-v2 ruby jobs on 24.04.
runs-on: ubuntu-24.04
defaults:
run:
working-directory: infra/smalruby-mesh-v2
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
- uses: ruby/setup-ruby@b1da4809b005e0178fe08a1d57317bffc00b7b4c # v1.332.0
- uses: ruby/setup-ruby@7f797815d8adceb1c412e7abefdd1ab4abc47a5f # v1.335.0
with:
ruby-version-file: infra/smalruby-mesh-v2/.ruby-version
bundler-cache: true
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:

security:
name: "[mesh-v2] Security Audits"
# ubuntu-latest moved to 26.04, where setup-ruby has no Ruby 3.4.1 yet.
# ubuntu-latest moved to 26.04; keep the mesh-v2 ruby jobs on 24.04.
runs-on: ubuntu-24.04
defaults:
run:
Expand All @@ -76,7 +76,7 @@ jobs:
node-version-file: infra/smalruby-mesh-v2/.node-version
cache: npm
cache-dependency-path: infra/smalruby-mesh-v2/package-lock.json
- uses: ruby/setup-ruby@b1da4809b005e0178fe08a1d57317bffc00b7b4c # v1.332.0
- uses: ruby/setup-ruby@7f797815d8adceb1c412e7abefdd1ab4abc47a5f # v1.335.0
with:
ruby-version-file: infra/smalruby-mesh-v2/.ruby-version
bundler-cache: true
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ permissions:
jobs:
lint:
name: "[smalruby3] StandardRB Lint"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: keep the gem builds on 24.04
defaults:
run:
working-directory: ruby/smalruby3
Expand All @@ -30,7 +30,7 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
- uses: ruby/setup-ruby@b1da4809b005e0178fe08a1d57317bffc00b7b4c # v1.332.0
- uses: ruby/setup-ruby@7f797815d8adceb1c412e7abefdd1ab4abc47a5f # v1.335.0
with:
ruby-version-file: ruby/smalruby3/.ruby-version
bundler-cache: true
Expand All @@ -40,7 +40,7 @@ jobs:

unit-test:
name: "[smalruby3] Unit Tests (Ruby ${{ matrix.ruby }})"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: keep the gem builds on 24.04
strategy:
fail-fast: false
matrix:
Expand All @@ -59,7 +59,7 @@ jobs:
# SHA 固定するとツールチェーン名を ref から読めないため明示する
with:
toolchain: stable
- uses: ruby/setup-ruby@b1da4809b005e0178fe08a1d57317bffc00b7b4c # v1.332.0
- uses: ruby/setup-ruby@7f797815d8adceb1c412e7abefdd1ab4abc47a5f # v1.335.0
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gem-build-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ permissions:
jobs:
build-linux:
name: "Build gem (Linux / Ruby ${{ inputs.ruby-version || '3.4' }})"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: keep the gem builds on 24.04
defaults:
run:
working-directory: ruby/smalruby3
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-gem.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
test:
name: "[smalruby3] Test before release"
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: keep the gem builds on 24.04
strategy:
fail-fast: false
matrix:
Expand All @@ -31,7 +31,7 @@ jobs:
# SHA 固定するとツールチェーン名を ref から読めないため明示する
with:
toolchain: stable
- uses: ruby/setup-ruby@b1da4809b005e0178fe08a1d57317bffc00b7b4c # v1.332.0
- uses: ruby/setup-ruby@7f797815d8adceb1c412e7abefdd1ab4abc47a5f # v1.335.0
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
Expand All @@ -47,7 +47,7 @@ jobs:
release:
name: "[smalruby3] Publish to RubyGems"
needs: test
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: keep the gem builds on 24.04
environment: rubygems
defaults:
run:
Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
sudo apt-get update
sudo apt-get install -y libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev

- uses: ruby/setup-ruby@b1da4809b005e0178fe08a1d57317bffc00b7b4c # v1.332.0
- uses: ruby/setup-ruby@7f797815d8adceb1c412e7abefdd1ab4abc47a5f # v1.335.0
with:
ruby-version-file: ruby/smalruby3/.ruby-version
bundler-cache: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: no Playwright chromium build yet
permissions:
contents: read
strategy:
Expand All @@ -35,7 +35,7 @@ jobs:

results:
name: Test Results
runs-on: ubuntu-latest
runs-on: ubuntu-24.04 # ubuntu-latest is 26.04: no Playwright chromium build yet
needs: test
if: ${{ !cancelled() }}
permissions:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.15.0
24.22.1
8 changes: 4 additions & 4 deletions .vscode/cargo.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
# システム Ruby ではなく rbenv 配下の Ruby を使うために必要。
#
# 設定例:
# RUBY=/Users/<user>/.anyenv/envs/rbenv/versions/3.4.1/bin/ruby
# PATH=/Users/<user>/.anyenv/envs/rbenv/versions/3.4.1/bin:/usr/bin:/bin
# RUBY=/Users/<user>/.anyenv/envs/rbenv/versions/3.4.12/bin/ruby
# PATH=/Users/<user>/.anyenv/envs/rbenv/versions/3.4.12/bin:/usr/bin:/bin
#
# Linux + rbenv の場合:
# RUBY=/home/<user>/.rbenv/versions/3.4.1/bin/ruby
# PATH=/home/<user>/.rbenv/versions/3.4.1/bin:/usr/bin:/bin
# RUBY=/home/<user>/.rbenv/versions/3.4.12/bin/ruby
# PATH=/home/<user>/.rbenv/versions/3.4.12/bin:/usr/bin:/bin

RUBY=/path/to/your/ruby
PATH=/path/to/your/ruby/bin:/usr/bin:/bin
12 changes: 12 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,18 @@ RUN \
libosmesa6 \
fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1

# Refuse to build on a stale base image. The eMudhra intermediate CA keys leaked
# (2026-10); Debian 12 drops the affected roots in ca-certificates 20250419~deb12u2.
# The check is tied to Debian 12, so a base image on another release fails here
# until this line is updated for it.
RUN grep -q '^12\.' /etc/debian_version \
&& dpkg --compare-versions "$(dpkg-query -W -f='${Version}' ca-certificates)" ge 20250419~deb12u2 \
|| { echo "Debian $(cat /etc/debian_version) / ca-certificates $(dpkg-query -W -f='${Version}' ca-certificates): rebuild with --pull, or update this check for the new base" >&2; exit 1; }
# Node.js 24.22.1 is the security release that updates the bundled root store for the
# eMudhra compromise. Any other major fails so the check is revisited when the base moves.
RUN node -e "const [a, b, c] = process.versions.node.split('.').map(Number); \
if (a !== 24 || b < 22 || (b === 22 && c < 1)) { console.error('Node.js ' + process.version + ' is not 24.22.1+ (rebuild with --pull)'); process.exit(1); }"

# Development convenience tools (separate layer to avoid busting app build cache)
#
# iptables / ipset / dnsutils (dig) are required by .devcontainer/init-firewall.sh,
Expand Down
16 changes: 14 additions & 2 deletions infra/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,18 @@ RUN \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

# Refuse to build on a stale base image. The eMudhra intermediate CA keys leaked
# (2026-10); Debian 12 drops the affected roots in ca-certificates 20250419~deb12u2.
# The check is tied to Debian 12, so a base image on another release fails here
# until this line is updated for it.
RUN grep -q '^12\.' /etc/debian_version \
&& dpkg --compare-versions "$(dpkg-query -W -f='${Version}' ca-certificates)" ge 20250419~deb12u2 \
|| { echo "Debian $(cat /etc/debian_version) / ca-certificates $(dpkg-query -W -f='${Version}' ca-certificates): rebuild with --pull, or update this check for the new base" >&2; exit 1; }
# Node.js 24.22.1 is the security release that updates the bundled root store for the
# eMudhra compromise. Any other major fails so the check is revisited when the base moves.
RUN node -e "const [a, b, c] = process.versions.node.split('.').map(Number); \
if (a !== 24 || b < 22 || (b === 22 && c < 1)) { console.error('Node.js ' + process.version + ' is not 24.22.1+ (rebuild with --pull)'); process.exit(1); }"

# Install AWS CLI v2
RUN \
set -eux \
Expand All @@ -39,8 +51,8 @@ RUN \
&& git clone --depth=1 https://github.com/rbenv/ruby-build.git ${RBENV_ROOT}/plugins/ruby-build
ENV PATH="${RBENV_ROOT}/bin:${RBENV_ROOT}/shims:${PATH}"

# Install Ruby 3.4.1
ARG RUBY_VERSION=3.4.1
# Install Ruby 3.4.12
ARG RUBY_VERSION=3.4.12
RUN rbenv install ${RUBY_VERSION} && rbenv global ${RUBY_VERSION}
RUN gem install bundler --no-document

Expand Down
2 changes: 1 addition & 1 deletion infra/smalruby-admin/.node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.8.0
24.22.1
Loading
Loading