Skip to content

Commit 36f8a0f

Browse files
committed
Merge branch 'release/0.5.6'
2 parents d857b02 + 2533de1 commit 36f8a0f

File tree

6 files changed

+35
-25
lines changed

6 files changed

+35
-25
lines changed

.github/dependabot.yml

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ updates:
1919
labels:
2020
- 'dependencies'
2121
- 'ruby'
22+
groups:
23+
rubocop:
24+
patterns:
25+
- 'rubocop'
26+
- 'rubocop-*'
2227

2328
- package-ecosystem: 'github-actions'
2429
directory: '/'

.github/workflows/automerge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
steps:
1313
- name: Dependabot metadata
1414
id: metadata
15-
uses: dependabot/fetch-metadata@v2.2.0
15+
uses: dependabot/fetch-metadata@v2.3.0
1616
with:
1717
github-token: '${{ secrets.PAT }}'
1818

.rubocop.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
require:
1+
plugins:
22
- rubocop-minitest
33
- rubocop-rake
44
- rubocop-performance

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.1
1+
3.4.2

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.4.1-alpine AS builder
1+
FROM ruby:3.4.2-alpine AS builder
22
RUN apk add --no-cache build-base
33

44
WORKDIR /forecast-collector
@@ -8,7 +8,7 @@ RUN bundle config --local frozen 1 && \
88
bundle install -j4 --retry 3 && \
99
bundle clean --force
1010

11-
FROM ruby:3.4.1-alpine
11+
FROM ruby:3.4.2-alpine
1212
LABEL maintainer="georg@ledermann.dev"
1313

1414
# Add tzdata to get correct timezone

Gemfile.lock

+25-20
Original file line numberDiff line numberDiff line change
@@ -16,55 +16,60 @@ GEM
1616
hashdiff (1.1.2)
1717
influxdb-client (3.2.0)
1818
csv
19-
json (2.9.1)
20-
language_server-protocol (3.17.0.3)
21-
logger (1.6.5)
19+
json (2.10.1)
20+
language_server-protocol (3.17.0.4)
21+
lint_roller (1.1.0)
22+
logger (1.6.6)
2223
minitest (5.25.4)
2324
minitest-silence (0.2.4)
2425
minitest (~> 5.12)
2526
parallel (1.26.3)
26-
parser (3.3.6.0)
27+
parser (3.3.7.1)
2728
ast (~> 2.4.1)
2829
racc
2930
public_suffix (6.0.1)
3031
racc (1.8.1)
3132
rainbow (3.1.1)
3233
rake (13.2.1)
3334
regexp_parser (2.10.0)
34-
rexml (3.4.0)
35-
rubocop (1.70.0)
35+
rexml (3.4.1)
36+
rubocop (1.73.2)
3637
json (~> 2.3)
37-
language_server-protocol (>= 3.17.0)
38+
language_server-protocol (~> 3.17.0.2)
39+
lint_roller (~> 1.1.0)
3840
parallel (~> 1.10)
3941
parser (>= 3.3.0.2)
4042
rainbow (>= 2.2.2, < 4.0)
4143
regexp_parser (>= 2.9.3, < 3.0)
42-
rubocop-ast (>= 1.36.2, < 2.0)
44+
rubocop-ast (>= 1.38.0, < 2.0)
4345
ruby-progressbar (~> 1.7)
4446
unicode-display_width (>= 2.4.0, < 4.0)
45-
rubocop-ast (1.37.0)
47+
rubocop-ast (1.38.1)
4648
parser (>= 3.3.1.0)
47-
rubocop-minitest (0.36.0)
48-
rubocop (>= 1.61, < 2.0)
49-
rubocop-ast (>= 1.31.1, < 2.0)
50-
rubocop-performance (1.23.1)
51-
rubocop (>= 1.48.1, < 2.0)
52-
rubocop-ast (>= 1.31.1, < 2.0)
53-
rubocop-rake (0.6.0)
54-
rubocop (~> 1.0)
49+
rubocop-minitest (0.37.1)
50+
lint_roller (~> 1.1)
51+
rubocop (>= 1.72.1, < 2.0)
52+
rubocop-ast (>= 1.38.0, < 2.0)
53+
rubocop-performance (1.24.0)
54+
lint_roller (~> 1.1)
55+
rubocop (>= 1.72.1, < 2.0)
56+
rubocop-ast (>= 1.38.0, < 2.0)
57+
rubocop-rake (0.7.1)
58+
lint_roller (~> 1.1)
59+
rubocop (>= 1.72.1)
5560
ruby-progressbar (1.13.0)
5661
simplecov (0.22.0)
5762
docile (~> 1.1)
5863
simplecov-html (~> 0.11)
5964
simplecov_json_formatter (~> 0.1)
6065
simplecov-html (0.13.1)
6166
simplecov_json_formatter (0.1.4)
62-
unicode-display_width (3.1.3)
67+
unicode-display_width (3.1.4)
6368
unicode-emoji (~> 4.0, >= 4.0.4)
6469
unicode-emoji (4.0.4)
6570
vcr (6.3.1)
6671
base64
67-
webmock (3.24.0)
72+
webmock (3.25.0)
6873
addressable (>= 2.8.0)
6974
crack (>= 0.3.2)
7075
hashdiff (>= 0.4.0, < 2.0.0)
@@ -91,4 +96,4 @@ DEPENDENCIES
9196
webmock
9297

9398
BUNDLED WITH
94-
2.6.2
99+
2.6.5

0 commit comments

Comments
 (0)