From 4a2ad99288133ade9d196cf59524cbcb2eaa8124 Mon Sep 17 00:00:00 2001 From: Cyril Rohr Date: Thu, 10 Sep 2026 08:44:02 +0200 Subject: [PATCH 1/2] Refresh v5 Ruby image and compatible Pry dependency --- Dockerfile | 4 +--- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67b6192..a4078eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,4 @@ -# Pinning, because Amazon Linux 2 doesn't support openssh 9+ clients yet, and we need to maintain compatibility with older pullpreview instances. -# FIXME: Switch back to ruby@3.1-slim after end of august 2023, when we can be sure that newer instances have been created with Amazon Linux 2023. -FROM ruby@sha256:54d09dd38d80d8b850fbff21425d9bd159f9ff7e1de1cdbcbb0b7745f5049784 +FROM ruby:3.3-slim-bookworm RUN apt-get -qq update && apt-get -qq -y install openssh-client git >/dev/null WORKDIR /app diff --git a/Gemfile b/Gemfile index cc95c3c..3da0176 100644 --- a/Gemfile +++ b/Gemfile @@ -4,4 +4,4 @@ gem 'aws-sdk-lightsail' gem 'slop' gem 'octokit' gem 'terminal-table' -gem 'pry' +gem 'pry', '~> 0.14.2' diff --git a/Gemfile.lock b/Gemfile.lock index a8b0f97..c020b7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,18 +16,18 @@ GEM aws-sigv4 (1.1.3) aws-eventstream (~> 1.0, >= 1.0.2) base64 (0.2.0) - coderay (1.1.2) + coderay (1.1.3) faraday (2.7.12) base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) jmespath (1.6.1) - method_source (1.0.0) + method_source (1.1.0) octokit (8.0.0) faraday (>= 1, < 3) sawyer (~> 0.9) - pry (0.13.1) + pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) public_suffix (5.0.4) @@ -46,7 +46,7 @@ PLATFORMS DEPENDENCIES aws-sdk-lightsail octokit - pry + pry (~> 0.14.2) slop terminal-table From 40244b606595e2c7f6ec090a1144b1b4bd8d3f20 Mon Sep 17 00:00:00 2001 From: Cyril Rohr Date: Thu, 10 Sep 2026 09:01:33 +0200 Subject: [PATCH 2/2] Remove Pry debug console and update checkout to v7 --- .github/workflows/pullpreview-multi-env.yml | 4 ++-- .github/workflows/pullpreview.yml | 2 +- Gemfile | 1 - Gemfile.lock | 6 ------ bin/pullpreview | 5 +---- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/.github/workflows/pullpreview-multi-env.yml b/.github/workflows/pullpreview-multi-env.yml index 657bd2b..8d4c12c 100644 --- a/.github/workflows/pullpreview-multi-env.yml +++ b/.github/workflows/pullpreview-multi-env.yml @@ -11,7 +11,7 @@ jobs: if: github.event_name == 'schedule' || github.event_name == 'push' || github.event.label.name == 'pullpreview-multi-env' || contains(github.event.pull_request.labels.*.name, 'pullpreview-multi-env') timeout-minutes: 30 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - uses: "./" with: deployment_variant: env1 @@ -29,7 +29,7 @@ jobs: if: github.event_name == 'schedule' || github.event_name == 'push' || github.event.label.name == 'pullpreview-multi-env' || contains(github.event.pull_request.labels.*.name, 'pullpreview-multi-env') timeout-minutes: 30 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - uses: "./" with: deployment_variant: env2 diff --git a/.github/workflows/pullpreview.yml b/.github/workflows/pullpreview.yml index 87963d6..a1f53ff 100644 --- a/.github/workflows/pullpreview.yml +++ b/.github/workflows/pullpreview.yml @@ -23,7 +23,7 @@ jobs: if: github.event_name == 'schedule' || github.event_name == 'push' || github.event.label.name == 'pullpreview' || contains(github.event.pull_request.labels.*.name, 'pullpreview') timeout-minutes: 30 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - uses: "./" with: admins: "@collaborators/push" diff --git a/Gemfile b/Gemfile index 3da0176..4225d67 100644 --- a/Gemfile +++ b/Gemfile @@ -4,4 +4,3 @@ gem 'aws-sdk-lightsail' gem 'slop' gem 'octokit' gem 'terminal-table' -gem 'pry', '~> 0.14.2' diff --git a/Gemfile.lock b/Gemfile.lock index c020b7f..10bf853 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -16,20 +16,15 @@ GEM aws-sigv4 (1.1.3) aws-eventstream (~> 1.0, >= 1.0.2) base64 (0.2.0) - coderay (1.1.3) faraday (2.7.12) base64 faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.2) jmespath (1.6.1) - method_source (1.1.0) octokit (8.0.0) faraday (>= 1, < 3) sawyer (~> 0.9) - pry (0.14.2) - coderay (~> 1.1) - method_source (~> 1.0) public_suffix (5.0.4) ruby2_keywords (0.0.5) sawyer (0.9.2) @@ -46,7 +41,6 @@ PLATFORMS DEPENDENCIES aws-sdk-lightsail octokit - pry (~> 0.14.2) slop terminal-table diff --git a/bin/pullpreview b/bin/pullpreview index ddab8a9..9e095d3 100755 --- a/bin/pullpreview +++ b/bin/pullpreview @@ -1,7 +1,6 @@ #!/usr/bin/env ruby require "pathname" -require "pry" require "slop" require_relative "../lib/pull_preview" @@ -84,8 +83,6 @@ begin end PullPreview::GithubSync.run(app_path, opts.to_hash) - when "console" - binding.pry when "list" opts = Slop.parse do |o| o.banner = "Usage: pullpreview list org/repo [options]" @@ -95,7 +92,7 @@ begin end PullPreview::List.run(opts) else - puts "Usage: pullpreview [up|down|list|console|github-sync] [options]" + puts "Usage: pullpreview [up|down|list|github-sync] [options]" exit 1 end rescue PullPreview::Error, StandardError => e