diff --git a/.github/workflows/test-ruby-feature.yaml b/.github/workflows/test-ruby-feature.yaml index 6b932e7..7492b2d 100644 --- a/.github/workflows/test-ruby-feature.yaml +++ b/.github/workflows/test-ruby-feature.yaml @@ -29,4 +29,4 @@ jobs: cacheFrom: ghcr.io/rails/devcontainer/test-ruby-feature subFolder: .github refFilterForPush: refs/heads/main - runCmd: ruby -v || ( echo "Ruby is not installed."; exit 1 ) + runCmd: RUBY_YJIT_ENABLE=1 ruby -v | grep +YJIT || ( echo "Ruby is not installed."; exit 1 ) diff --git a/features/ruby/devcontainer-feature.json b/features/ruby/devcontainer-feature.json index 7e5ba5a..d3d6d7d 100644 --- a/features/ruby/devcontainer-feature.json +++ b/features/ruby/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "ruby", - "version": "1.0.0", + "version": "1.1.0", "name": "Ruby (via rbenv)", "description": "Installs Ruby, rbenv, ruby-build and libraries needed to build Ruby", "customizations": { @@ -16,13 +16,10 @@ "installsAfter": [ "ghcr.io/devcontainers/features/common-utils" ], - "dependsOn": { - "ghcr.io/devcontainers/features/rust": {} - }, "options": { "version": { "type": "string", - "default": "3.3.0", + "default": "3.3.1", "description": "The ruby version to be installed" } } diff --git a/features/ruby/install.sh b/features/ruby/install.sh index 826361c..b55707c 100755 --- a/features/ruby/install.sh +++ b/features/ruby/install.sh @@ -5,7 +5,7 @@ USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}" apt-get update -y apt-get -y install --no-install-recommends libssl-dev libreadline-dev zlib1g-dev autoconf bison build-essential \ - libyaml-dev libreadline-dev libncurses5-dev libffi-dev libgdbm-dev libxml2-dev + libyaml-dev libreadline-dev libncurses5-dev libffi-dev libgdbm-dev libxml2-dev rustc git clone https://github.com/rbenv/rbenv.git /usr/local/share/rbenv git clone https://github.com/rbenv/ruby-build.git /usr/local/share/ruby-build diff --git a/images/ruby/.devcontainer/devcontainer.json b/images/ruby/.devcontainer/devcontainer.json index 730bbdd..5bd0657 100644 --- a/images/ruby/.devcontainer/devcontainer.json +++ b/images/ruby/.devcontainer/devcontainer.json @@ -18,9 +18,6 @@ "ghcr.io/rails/devcontainer/features/ruby": { "version": "${localEnv:RUBY_VERSION}" }, - "ghcr.io/devcontainers/features/rust:1": { - "version": "1.77" - } }, // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "vscode"