From 2495293c02f54d696923ce512afde3a84fd1c3e8 Mon Sep 17 00:00:00 2001
From: Drew Bollinger <drew.bollinger@gsa.gov>
Date: Wed, 15 Nov 2023 16:25:43 -0500
Subject: [PATCH 1/2] default to ruby 3.1

---
 Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f2002df..07c857a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -83,8 +83,8 @@ RUN sudo usermod --append --groups rvm customer
 USER customer
 
 # Configure rvm and install default Ruby
-ENV RUBY_VERSION 2.7.5
-ENV RUBY_VERSION_MIN 2.6.6
+ENV RUBY_VERSION 3.1.4
+ENV RUBY_VERSION_MIN 3.0.6
 RUN source /usr/local/rvm/scripts/rvm \
   # Fail if deps are missing, won't prompt for sudo
   && rvm autolibs read-fail \
@@ -95,7 +95,7 @@ RUN source /usr/local/rvm/scripts/rvm \
 
 # Update to the latest RubyGems
 RUN source /usr/local/rvm/scripts/rvm && \
-    rvm rubygems 3.4.13
+    rvm rubygems 3.4.22
 
 # Default to Node 18
 ENV NODE_VERSION lts/hydrogen

From 5c5a786153c4a322db78f5de4e5d1ed227d7ba60 Mon Sep 17 00:00:00 2001
From: Drew Bollinger <drew.bollinger@gsa.gov>
Date: Wed, 15 Nov 2023 16:25:58 -0500
Subject: [PATCH 2/2] pr shouldn't trigger nightly

---
 ci/pipeline-dev.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ci/pipeline-dev.yml b/ci/pipeline-dev.yml
index 6373fc6..6f9b5d6 100644
--- a/ci/pipeline-dev.yml
+++ b/ci/pipeline-dev.yml
@@ -139,7 +139,6 @@ jobs:
         trigger: true
       - get: src
         resource: pr-((git-branch))
-        trigger: true
       - task: restage
         config:
           <<: *cf-image