From 47ff718ccda7e8c631bcb0a3934c00685c335406 Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Mon, 5 May 2025 09:05:54 +0000 Subject: [PATCH 1/2] [vscode] improve workspace setup --- sentry-ruby.code-workspace | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/sentry-ruby.code-workspace b/sentry-ruby.code-workspace index 0ec40e923..257b1d3a4 100644 --- a/sentry-ruby.code-workspace +++ b/sentry-ruby.code-workspace @@ -1,14 +1,8 @@ { "folders": [ { - "path": ".devcontainer" - }, - { - "path": ".github", - }, - { - "path": ".", - "name": "root" + "name": "root", + "path": "." }, { "path": "sentry-ruby" @@ -32,6 +26,21 @@ "path": "sentry-raven" } ], + "settings": { + "files.exclude": { + "sentry-delayed_job": true, + "sentry-rails": true, + "sentry-raven": true, + "sentry-resque": true, + "sentry-ruby": true, + "sentry-sidekiq": true, + "sentry-opentelemetry": true + }, + "rubyLsp.formatter": "rubocop", + "rubyLsp.rubyVersionManager": { + "identifier": "auto" + } + }, "extensions": { "recommendations": [ "Shopify.ruby-lsp" From 1474f2df64e8174bd259ec709dba58b9de2794fc Mon Sep 17 00:00:00 2001 From: Peter Solnica Date: Mon, 5 May 2025 09:08:18 +0000 Subject: [PATCH 2/2] [docker] fix ruby-lsp setup --- .devcontainer/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 76bc473bc..4eba265f0 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -38,11 +38,13 @@ RUN chown -R sentry:sentry /workspace/sentry RUN mkdir /workspace/gems && chown -R sentry:sentry /workspace/gems ARG TAG=latest +ARG GEM_HOME="/workspace/gems/${TAG}" ENV LANG=C.UTF-8 \ BUNDLE_JOBS=4 \ BUNDLE_RETRY=3 \ GEM_HOME=/workspace/gems/${TAG} \ + PATH=$PATH:${GEM_HOME}/bin \ REDIS_HOST=redis USER sentry