Fix codespaces prebuilds (again) (#2552)

primer · Jan 31, 2024 · 04365ae · 04365ae
1 parent 2b6cdfa
commit 04365ae
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -41,9 +41,8 @@ RUN curl --fail --location --output /usr/bin/overmind.gz https://github.com/Dart
 # Install Node.js
 RUN if [ "${INSTALL_NODE}" = "true" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
 
-# Install gems
-ARG BUNDLER_VERSION=2.2.11
-RUN gem install bundler:${BUNDLER_VERSION} solargraph:'~> 0.50.0'
+# Install gems (see script/setup for installing lib and app dependencies)
+RUN gem install solargraph:'~> 0.50.0'
 
 # Install chrome
 RUN curl --silent --show-error --location --fail --retry 3 --output /tmp/google-chrome-stable_current_amd64.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -48,7 +48,7 @@ jobs:
       matrix:
         include:
           - rails_version: "6.1.1"
-            ruby_version: "2.7"
+            ruby_version: "3.0"
           - rails_version: "7.0.3"
             ruby_version: "3.0"
           - rails_version: "7.1.1"
@@ -92,7 +92,7 @@ jobs:
       matrix:
         include:
           - rails_version: "6.1.1"
-            ruby_version: "2.7"
+            ruby_version: "3.0"
           - rails_version: "7.0.3"
             ruby_version: "3.0"
           - rails_version: "7.1.1"
@@ -136,7 +136,7 @@ jobs:
       matrix:
         include:
           - rails_version: "6.1.1"
-            ruby_version: "2.7"
+            ruby_version: "3.0"
           - rails_version: "7.0.3"
             ruby_version: "3.0"
           - rails_version: "7.1.1"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -136,10 +136,10 @@ GEM
     msgpack (1.7.2)
     mutex_m (0.1.2)
     nio4r (2.7.0)
-    nokogiri (1.15.4)
+    nokogiri (1.16.0)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
     octicons (19.8.0)
     parallel (1.23.0)
@@ -319,4 +319,4 @@ DEPENDENCIES
   yard (~> 0.9.25)
 
 BUNDLED WITH
-   2.3.6
+   2.5.5
diff --git a/app/components/primer/alpha/segmented_control.pcss b/app/components/primer/alpha/segmented_control.pcss
@@ -11,8 +11,7 @@
 
 .SegmentedControl--iconOnly {
   & .Button--iconOnly.Button--small,
-  & .Button--iconOnly.Button--medium,
-  & .Button--iconOnly.Button--large {
+  & .Button--iconOnly.Button--medium {
     width: 100%;
     padding-inline: 0 !important;
   }

diff --git a/demo/Gemfile.lock b/demo/Gemfile.lock
@@ -378,4 +378,4 @@ DEPENDENCIES
   view_component (>= 3.1.0)
 
 BUNDLED WITH
-   2.4.1
+   2.5.5
-Original file line number
+Diff line change
@@ Expand Up / @@ -378,4 +378,4 @@ DEPENDENCIES @@
       view_component (>= 3.1.0)
     BUNDLED WITH
-.4.1
+.5.5