Skip to content

Commit 5b12575

Browse files
committed
Merge branch 'release/0.5.7'
2 parents 8b3559a + acbe9ec commit 5b12575

5 files changed

Lines changed: 34 additions & 37 deletions

File tree

.github/workflows/push.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
steps:
2626
- name: Checkout the code
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2828

2929
- name: Set up Ruby
3030
uses: ruby/setup-ruby@v1
@@ -37,7 +37,7 @@ jobs:
3737
- name: Run tests
3838
run: bundle exec rspec
3939

40-
- uses: qltysh/qlty-action/coverage@v1
40+
- uses: qltysh/qlty-action/coverage@v2
4141
with:
4242
token: ${{secrets.QLTY_COVERAGE_TOKEN}}
4343
files: coverage/.resultset.json
@@ -49,7 +49,7 @@ jobs:
4949

5050
steps:
5151
- name: Checkout the code
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v5
5353
with:
5454
fetch-depth: 0
5555

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4.5
1+
3.4.7

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.4.5-alpine AS builder
1+
FROM ruby:3.4.7-alpine AS builder
22
RUN apk add --no-cache build-base
33

44
WORKDIR /csv-importer
@@ -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.5-alpine
11+
FROM ruby:3.4.7-alpine
1212
LABEL maintainer="georg@ledermann.dev"
1313

1414
# Decrease memory usage

Gemfile.lock

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (8.0.2)
4+
activesupport (8.1.1)
55
base64
6-
benchmark (>= 0.3)
76
bigdecimal
87
concurrent-ruby (~> 1.0, >= 1.3.1)
98
connection_pool (>= 2.2.5)
109
drb
1110
i18n (>= 1.6, < 2)
11+
json
1212
logger (>= 1.4.2)
1313
minitest (>= 5.1)
1414
securerandom (>= 0.3)
@@ -18,71 +18,69 @@ GEM
1818
public_suffix (>= 2.0.2, < 7.0)
1919
ast (2.4.3)
2020
base64 (0.3.0)
21-
benchmark (0.4.1)
22-
bigdecimal (3.2.2)
21+
bigdecimal (3.3.1)
2322
concurrent-ruby (1.3.5)
24-
connection_pool (2.5.3)
25-
crack (1.0.0)
23+
connection_pool (2.5.4)
24+
crack (1.0.1)
2625
bigdecimal
2726
rexml
2827
csv (3.3.5)
2928
diff-lcs (1.6.2)
3029
docile (1.4.1)
3130
dotenv (3.1.8)
3231
drb (2.2.3)
33-
hashdiff (1.2.0)
32+
hashdiff (1.2.1)
3433
i18n (1.14.7)
3534
concurrent-ruby (~> 1.0)
3635
influxdb-client (3.2.0)
3736
csv
38-
json (2.13.2)
37+
json (2.16.0)
3938
language_server-protocol (3.17.0.5)
4039
lint_roller (1.1.0)
4140
logger (1.7.0)
42-
minitest (5.25.5)
41+
minitest (5.26.1)
4342
parallel (1.27.0)
44-
parser (3.3.9.0)
43+
parser (3.3.10.0)
4544
ast (~> 2.4.1)
4645
racc
47-
prism (1.4.0)
46+
prism (1.6.0)
4847
public_suffix (6.0.2)
4948
racc (1.8.1)
5049
rainbow (3.1.1)
51-
rake (13.3.0)
52-
regexp_parser (2.10.0)
53-
rexml (3.4.1)
54-
rspec (3.13.1)
50+
rake (13.3.1)
51+
regexp_parser (2.11.3)
52+
rexml (3.4.4)
53+
rspec (3.13.2)
5554
rspec-core (~> 3.13.0)
5655
rspec-expectations (~> 3.13.0)
5756
rspec-mocks (~> 3.13.0)
58-
rspec-core (3.13.5)
57+
rspec-core (3.13.6)
5958
rspec-support (~> 3.13.0)
6059
rspec-expectations (3.13.5)
6160
diff-lcs (>= 1.2.0, < 2.0)
6261
rspec-support (~> 3.13.0)
63-
rspec-mocks (3.13.5)
62+
rspec-mocks (3.13.7)
6463
diff-lcs (>= 1.2.0, < 2.0)
6564
rspec-support (~> 3.13.0)
66-
rspec-support (3.13.4)
67-
rubocop (1.79.0)
65+
rspec-support (3.13.6)
66+
rubocop (1.81.7)
6867
json (~> 2.3)
6968
language_server-protocol (~> 3.17.0.2)
7069
lint_roller (~> 1.1.0)
7170
parallel (~> 1.10)
7271
parser (>= 3.3.0.2)
7372
rainbow (>= 2.2.2, < 4.0)
7473
regexp_parser (>= 2.9.3, < 3.0)
75-
rubocop-ast (>= 1.46.0, < 2.0)
74+
rubocop-ast (>= 1.47.1, < 2.0)
7675
ruby-progressbar (~> 1.7)
77-
tsort (>= 0.2.0)
7876
unicode-display_width (>= 2.4.0, < 4.0)
79-
rubocop-ast (1.46.0)
77+
rubocop-ast (1.48.0)
8078
parser (>= 3.3.7.2)
8179
prism (~> 1.4)
8280
rubocop-rake (0.7.1)
8381
lint_roller (~> 1.1)
8482
rubocop (>= 1.72.1)
85-
rubocop-rspec (3.6.0)
83+
rubocop-rspec (3.7.0)
8684
lint_roller (~> 1.1)
8785
rubocop (~> 1.72, >= 1.72.1)
8886
ruby-progressbar (1.13.0)
@@ -93,18 +91,17 @@ GEM
9391
simplecov_json_formatter (~> 0.1)
9492
simplecov-html (0.13.2)
9593
simplecov_json_formatter (0.1.4)
96-
tsort (0.2.0)
9794
tzinfo (2.0.6)
9895
concurrent-ruby (~> 1.0)
9996
tzinfo-data (1.2025.2)
10097
tzinfo (>= 1.0.0)
101-
unicode-display_width (3.1.4)
102-
unicode-emoji (~> 4.0, >= 4.0.4)
103-
unicode-emoji (4.0.4)
104-
uri (1.0.3)
98+
unicode-display_width (3.2.0)
99+
unicode-emoji (~> 4.1)
100+
unicode-emoji (4.1.0)
101+
uri (1.1.1)
105102
vcr (6.3.1)
106103
base64
107-
webmock (3.25.1)
104+
webmock (3.26.1)
108105
addressable (>= 2.8.0)
109106
crack (>= 0.3.2)
110107
hashdiff (>= 0.4.0, < 2.0.0)
@@ -128,4 +125,4 @@ DEPENDENCIES
128125
webmock
129126

130127
BUNDLED WITH
131-
2.7.1
128+
2.7.2

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ docker exec -it solectrus-redis-1 redis-cli FLUSHALL
4747

4848
Check the `.env` variable `INSTALLATION_DATE`. This must be set to the day your PV system was installed.
4949

50-
**Important note:** Since SOLECTRUS v0.18, a second step is required: You need to reset the "Daily summaries" (via settings).
50+
**Important note:** Since SOLECTRUS v0.18, a second step is required: You must reset the Daily summaries (via “Settings” in the dashboard after you have logged in as admin).
5151

5252
### Configuration
5353

0 commit comments

Comments
 (0)