Skip to content

Commit a9bf0a7

Browse files
DakadDakad
committed
Merge remote-tracking branch 'origin/devex/update_to_the_latest' into misc/davida/add-gh-action-to-publish-docker-image
 Conflicts: .ruby-version Dockerfile Gemfile.lock
2 parents aa8ebde + b470e43 commit a9bf0a7

16 files changed

+761
-400
lines changed

‎.github/dependabot.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@ updates:
33
- package-ecosystem: bundler
44
directory: "/"
55
schedule:
6-
interval: daily
7-
time: "10:00"
6+
interval: monthly
87
open-pull-requests-limit: 10
98
ignore:
10-
- dependency-name: pry
11-
versions:
12-
- ">= 0.13.a"
13-
- "< 0.14"
9+
- dependency-name: pry
10+
versions:
11+
- ">= 0.13.a"
12+
- "< 0.14"
13+
groups:
14+
rubocop-dependencies:
15+
patterns:
16+
- "rubocop*"
17+
pronto-dependencies:
18+
patterns:
19+
- "pronto*"

‎.github/workflows/run-specs.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Specs
2+
3+
on:
4+
push:
5+
6+
jobs:
7+
spec:
8+
9+
runs-on: ubuntu-latest
10+
steps:
11+
- name: Install packages
12+
run: sudo apt-get update && sudo apt-get install --no-install-recommends -y libjemalloc2
13+
- uses: actions/checkout@v6
14+
- name: Set up Ruby
15+
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
16+
# change this to (see https://github.com/ruby/setup-ruby#versioning):
17+
uses: ruby/setup-ruby@v1
18+
with:
19+
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
20+
- name: Unpack test repo
21+
run: cd spec/fixtures && tar -zxf test.git.tar.gz
22+
- name: Run tests
23+
run: bundle exec rspec

‎.github/workflows/self.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@ on:
55

66
jobs:
77
run:
8+
permissions:
9+
checks: write
10+
contents: read
811
runs-on: ubuntu-latest
912
steps:
10-
- uses: actions/checkout@v1
13+
- uses: actions/checkout@v4
14+
- run: git fetch origin main
1115
- name: Pronto Run
1216
uses: ./
1317
with:
1418
target: origin/main
1519
runners: >-
16-
rubocop bundler_audit brakeman yamllint
20+
rubocop brakeman
1721
env:
1822
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,9 @@ build-iPhoneSimulator/
4949

5050
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
5151
.rvmrc
52+
53+
## Specific to RubyMine
54+
.idea
55+
56+
## Specific to asdf
57+
.tool-versions

‎.rubocop.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
plugins:
2+
- rubocop-capybara
3+
- rubocop-factory_bot
4+
- rubocop-minitest
5+
- rubocop-performance
6+
- rubocop-rake
7+
- rubocop-sequel
8+
- rubocop-yard
9+
10+
AllCops:
11+
NewCops: enable
12+
DisplayStyleGuide: true
13+
14+
Metrics:
15+
Enabled: false
16+
17+
Layout/LineLength:
18+
Enabled: false
19+
20+
# Align `end` with the matching keyword or starting expression except for
21+
# assignments, where it should be aligned with the LHS.
22+
Layout/EndAlignment:
23+
EnforcedStyleAlignWith: variable
24+
25+
# Method definitions after `private` or `protected` isolated calls need one
26+
# extra level of indentation.
27+
Layout/IndentationConsistency:
28+
EnforcedStyle: indented_internal_methods
29+
30+
Style/FrozenStringLiteralComment:
31+
EnforcedStyle: always
32+
33+
# Use `foo { bar }` not `foo {bar}`.
34+
Layout/SpaceInsideBlockBraces:
35+
EnforcedStyleForEmptyBraces: space
36+
37+
# Check quotes usage according to lint rule below.
38+
Style/StringLiterals:
39+
EnforcedStyle: double_quotes
40+
41+
Style/RedundantReturn:
42+
AllowMultipleReturnValues: true
43+
44+
Style/Semicolon:
45+
AllowAsExpressionSeparator: true
46+
47+
Style/StringLiteralsInInterpolation:
48+
EnforcedStyle: double_quotes
49+
50+
Style/RescueStandardError:
51+
EnforcedStyle: implicit
52+
53+
Style/SymbolArray:
54+
MinSize: 1
55+
56+
Style/DocumentationMethod:
57+
Enabled: true
58+
RequireForNonPublicMethods: true
59+
60+
YARD/MismatchName:
61+
EnforcedStylePrototypeName: before

‎CHANGELOG.md‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,83 @@
1+
4.6-r | 2025-11-28
2+
---
3+
Changes
4+
* Upgrade ruby to 3.3.x by @renatolond in https://github.com/renatolond/pronto-ruby/pull/70
5+
* Upgrade ruby to 3.4.7 by @renatolond in https://github.com/renatolond/pronto-ruby/pull/71
6+
7+
4.5-r | 2025-11-28
8+
---
9+
Changes
10+
* Bump rubocop-rails from 2.32.0 to 2.33.0 in the rubocop-dependencies group by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/57
11+
* Bump rubocop-rails from 2.33.0 to 2.33.3 in the rubocop-dependencies group by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/58
12+
* Bump the rubocop-dependencies group with 2 updates by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/59
13+
* Bump rubocop-performance from 1.25.0 to 1.26.0 in the rubocop-dependencies group by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/60
14+
* Bump rubocop-rails from 2.33.3 to 2.33.4 in the rubocop-dependencies group by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/61
15+
* Bump rubocop-performance from 1.26.0 to 1.26.1 in the rubocop-dependencies group by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/62
16+
* Bump rspec from 3.13.1 to 3.13.2 by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/63
17+
* Bump webmock from 3.25.1 to 3.26.0 by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/64
18+
* Bump webmock from 3.26.0 to 3.26.1 by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/65
19+
* Bump the rubocop-dependencies group with 2 updates by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/66
20+
* Bump rubocop-rails from 2.33.4 to 2.34.0 in the rubocop-dependencies group by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/67
21+
* Bump rubocop-rails from 2.34.0 to 2.34.1 in the rubocop-dependencies group by @dependabot[bot] in https://github.com/renatolond/pronto-ruby/pull/68
22+
23+
4.4-r | 2025-06-30
24+
---
25+
Changes
26+
* Bump rubocop-rspec from 3.5.0 to 3.6.0 in the rubocop-dependencies group by @dependabot in https://github.com/renatolond/pronto-ruby/pull/49
27+
* Bump the pronto-dependencies group across 1 directory with 2 updates by @dependabot in https://github.com/renatolond/pronto-ruby/pull/51
28+
* Bump rubocop-rails from 2.31.0 to 2.32.0 in the rubocop-dependencies group by @dependabot in https://github.com/renatolond/pronto-ruby/pull/52
29+
* Bump rspec from 3.13.0 to 3.13.1 by @dependabot in https://github.com/renatolond/pronto-ruby/pull/53
30+
* Bump rubocop-minitest from 0.38.0 to 0.38.1 in the rubocop-dependencies group by @dependabot in https://github.com/renatolond/pronto-ruby/pull/54
31+
* Bump rubocop-thread_safety from 0.7.2 to 0.7.3 in the rubocop-dependencies group by @dependabot in https://github.com/renatolond/pronto-ruby/pull/55
32+
* Bump rubocop-yard from 0.10.0 to 1.0.0 in the rubocop-dependencies group by @dependabot in https://github.com/renatolond/pronto-ruby/pull/56
33+
34+
4.3-r | 2025-04-01
35+
---
36+
Changes
37+
* Bump rubocop-rails from 2.28.0 to 2.29.0 in the rubocop-dependencies group by @dependabot in https://github.com/renatolond/pronto-ruby/pull/33
38+
* Bump pronto-stylelint from 0.10.3 to 0.11.0 in the pronto-dependencies group by @dependabot in https://github.com/renatolond/pronto-ruby/pull/34
39+
* Bump the rubocop-dependencies group with 2 updates by @dependabot in https://github.com/renatolond/pronto-ruby/pull/35
40+
* Update checkout version in workflow by @renatolond in https://github.com/renatolond/pronto-ruby/pull/36
41+
* Bump rubocop-rails from 2.29.0 to 2.29.1 in the rubocop-dependencies group by @dependabot in https://github.com/renatolond/pronto-ruby/pull/37
42+
* Bump webmock from 3.24.0 to 3.25.0 by @dependabot in https://github.com/renatolond/pronto-ruby/pull/38
43+
* Bump the rubocop-dependencies group with 5 updates by @dependabot in https://github.com/renatolond/pronto-ruby/pull/39
44+
* Bump the rubocop-dependencies group across 1 directory with 6 updates by @dependabot in https://github.com/renatolond/pronto-ruby/pull/45
45+
* Bump webmock from 3.25.0 to 3.25.1 by @dependabot in https://github.com/renatolond/pronto-ruby/pull/44
46+
* Bump the rubocop-dependencies group with 7 updates by @dependabot in https://github.com/renatolond/pronto-ruby/pull/46
47+
* Bump ruby to 3.2.8 by @renatolond in https://github.com/renatolond/pronto-ruby/pull/48
48+
49+
4.2-r | 2025-01-13
50+
---
51+
Changes:
52+
* Bump the pronto-dependencies group with 4 updates by @dependabot in https://github.com/renatolond/pronto-ruby/pull/30
53+
* Bump the rubocop-dependencies group across 1 directory with 5 updates by @dependabot in https://github.com/renatolond/pronto-ruby/pull/29
54+
* Add rubocop-capybara gem by @renatolond in https://github.com/renatolond/pronto-ruby/pull/31
55+
* Bump ruby to 3.2.6 by @renatolond in https://github.com/renatolond/pronto-ruby/pull/32
56+
57+
4.1-r | 2024-11-13
58+
---
59+
Changes:
60+
* Bump the rubocop-dependencies group with 2 updates by @dependabot in #16
61+
* Bump rspec from 3.11.0 to 3.13.0 by @dependabot in #13
62+
* Bump webmock from 3.23.1 to 3.24.0 by @dependabot in #18
63+
* Bump the rubocop-dependencies group across 1 directory with 4 updates by @dependabot in #23
64+
65+
4.0-r | 2024-09-18
66+
---
67+
**BREAKING CHANGES:**
68+
69+
* Unlike the original action, this fork is focused on Ruby-only. This means any node-related runners are removed.
70+
71+
* Pronto is upgraded, the following runners are not yet compatible and therefore removed:
72+
- pronto-bundler_audit
73+
- pronto-yamllint
74+
75+
Changes:
76+
* Upgrades ruby to 3.2.2
77+
* Upgrades Bundler to 2.4.3
78+
* Bump rubocop to 1.66.1
79+
* Upgrades all runners and dependencies
80+
181
4.0 | 2022-03-17
282
---
383

‎Dockerfile‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,19 @@ LABEL org.opencontainers.image.vendor="AppTweak"
1616
LABEL org.opencontainers.image.version=${CVS_REF}
1717
LABEL org.opencontainers.image.created=${BUILD_DATE}
1818

19-
RUN apt-get update \
20-
&& apt-get install -y --no-install-recommends \
21-
build-essential \
22-
cmake \
23-
curl \
24-
git \
25-
pkg-config \
26-
openssl \
27-
&& rm -rf /var/lib/apt/lists/*
19+
RUN apt-get update && apt-get install -y curl
20+
21+
RUN apt-get update && \
22+
apt-get install --no-install-recommends -y \
23+
build-essential \
24+
cmake \
25+
git \
26+
pkg-config \
27+
openssl \
28+
libssl-dev \
29+
libzstd-dev \
30+
libz-dev \
31+
&& rm -rf /var/lib/apt/lists/*
2832

2933
# Make sure to use bash with pipefail in case something
3034
# fails while being piped to another command in the docker-build
@@ -34,9 +38,9 @@ RUN gem install bundler --version "${BUNDLER_VERSION}"
3438

3539
WORKDIR /runner
3640

37-
COPY Gemfile* ./
41+
COPY Gemfile* .bundle ./
3842

39-
RUN bundle --retry 4
43+
RUN bundle install --retry 4
4044

4145
ENV BUNDLE_GEMFILE=/runner/Gemfile
4246

‎Gemfile‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
# frozen_string_literal: true
22

3-
# -*- mode: ruby -*-
4-
# Run: bundle install
3+
source "https://rubygems.org"
54

6-
source 'https://rubygems.org'
7-
8-
gem 'pronto'
9-
# Source repo has been archived: https://github.com/prontolabs/pronto-brakeman
10-
gem 'pronto-brakeman', github: "storypark/pronto-brakeman", require: false
11-
gem 'pronto-bundler_audit', require: false
12-
gem 'pronto-eslint_npm', require: false
13-
gem 'pronto-rails_best_practices', require: false
14-
gem 'pronto-rails_schema', require: false
15-
gem 'pronto-rubocop', require: false
5+
gem "pronto"
6+
gem "pronto-brakeman", require: false
7+
gem "pronto-rubocop", require: false
8+
# gem 'pronto-bundler_audit', require: false # Temporarily disabled, incompatible with current pronto
9+
gem "pronto-eslint_npm", require: false
10+
gem "pronto-rails_best_practices", require: false
11+
gem "pronto-rails_schema", require: false
1612
# gem 'pronto-poper', require: false
17-
gem 'pronto-erb_lint', require: false
18-
gem 'pronto-fasterer', require: false
19-
gem 'pronto-flay', require: false
20-
gem 'pronto-reek', require: false
21-
gem 'pronto-scss', require: false
22-
gem 'pronto-stylelint', require: false
23-
gem 'pronto-yamllint', require: false
13+
# gem 'pronto-yamllint', require: false # Temporarily disabled, seems to throw an error
14+
gem "pronto-erb_lint", require: false
15+
gem "pronto-fasterer", require: false
16+
gem "pronto-flay", require: false
17+
gem "pronto-reek", require: false
18+
gem "pronto-scss", require: false
19+
gem "pronto-stylelint", require: false
20+
21+
gem "rubocop-capybara", require: false
22+
gem "rubocop-factory_bot", require: false
23+
gem "rubocop-i18n", require: false
24+
gem "rubocop-minitest", require: false
25+
gem "rubocop-performance", require: false
26+
gem "rubocop-rails", require: false
27+
gem "rubocop-rake", require: false
28+
gem "rubocop-rspec", require: false
29+
gem "rubocop-sequel", require: false
30+
gem "rubocop-thread_safety", require: false
31+
gem "rubocop-yard", require: false
2432

25-
gem 'rubocop-i18n', require: false
26-
gem 'rubocop-minitest', require: false
27-
gem 'rubocop-performance', require: false
28-
gem 'rubocop-rails', require: false
29-
gem 'rubocop-rake', require: false
30-
gem 'rubocop-rspec', require: false
31-
gem 'rubocop-sequel', require: false
32-
gem 'rubocop-thread_safety', require: false
33-
gem 'rubocop-yard', require: false
33+
gem "rugged", "< 1.7.1" # Rugged v1.7.1 introduces an issue with pronto, see https://github.com/prontolabs/pronto/issues/447 for updates
3434

3535
group :test do
36-
gem 'climate_control'
37-
gem 'pry'
38-
gem 'rb-readline'
39-
gem 'rspec'
40-
gem 'webmock'
36+
gem "climate_control"
37+
gem "pry"
38+
gem "rb-readline"
39+
gem "rspec"
40+
gem "webmock"
4141
end

0 commit comments

Comments
 (0)