Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/pullpreview-multi-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pullpreview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ gem 'aws-sdk-lightsail'
gem 'slop'
gem 'octokit'
gem 'terminal-table'
gem 'pry'
6 changes: 0 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,15 @@ GEM
aws-sigv4 (1.1.3)
aws-eventstream (~> 1.0, >= 1.0.2)
base64 (0.2.0)
coderay (1.1.2)
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)
octokit (8.0.0)
faraday (>= 1, < 3)
sawyer (~> 0.9)
pry (0.13.1)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.0.4)
ruby2_keywords (0.0.5)
sawyer (0.9.2)
Expand All @@ -46,7 +41,6 @@ PLATFORMS
DEPENDENCIES
aws-sdk-lightsail
octokit
pry
slop
terminal-table

Expand Down
5 changes: 1 addition & 4 deletions bin/pullpreview
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env ruby

require "pathname"
require "pry"
require "slop"

require_relative "../lib/pull_preview"
Expand Down Expand Up @@ -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]"
Expand All @@ -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
Expand Down