Skip to content

Commit

Permalink
Merge branch 'release/0.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ledermann committed Jan 22, 2024
2 parents e76b8ad + aee8c7d commit 435952d
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 32 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,5 @@ jobs:
BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
cache-from: type=gha
cache-to: type=gha,mode=max
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.2.3
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2.2-alpine AS Builder
FROM ruby:3.2.3-alpine AS Builder
RUN apk add --no-cache build-base

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

FROM ruby:3.2.2-alpine
FROM ruby:3.2.3-alpine
LABEL maintainer="[email protected]"

# Decrease memory usage
Expand Down
45 changes: 22 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,51 +1,50 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.8.5)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
ast (2.4.2)
base64 (0.1.1)
climate_control (1.2.0)
crack (0.4.5)
rexml
docile (1.4.0)
dotenv (2.8.1)
hashdiff (1.0.1)
influxdb-client (2.9.0)
json (2.6.3)
hashdiff (1.1.0)
influxdb-client (3.0.0)
json (2.7.1)
language_server-protocol (3.17.0.3)
minitest (5.20.0)
minitest (5.21.2)
minitest-silence (0.2.4)
minitest (~> 5.12)
parallel (1.23.0)
parser (3.2.2.3)
parallel (1.24.0)
parser (3.3.0.5)
ast (~> 2.4.1)
racc
public_suffix (5.0.3)
racc (1.7.1)
public_suffix (5.0.4)
racc (1.7.3)
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
rake (13.1.0)
regexp_parser (2.9.0)
rexml (3.2.6)
rubocop (1.56.3)
base64 (~> 0.1.1)
rubocop (1.60.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.2.2.3)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.28.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.29.0)
rubocop-ast (1.30.0)
parser (>= 3.2.1.0)
rubocop-minitest (0.32.1)
rubocop-minitest (0.34.5)
rubocop (>= 1.39, < 2.0)
rubocop-performance (1.19.1)
rubocop (>= 1.7.0, < 2.0)
rubocop-ast (>= 0.4.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-performance (1.20.2)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.30.0, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
ruby-progressbar (1.13.0)
Expand All @@ -55,7 +54,7 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
unicode-display_width (2.4.2)
unicode-display_width (2.5.0)
vcr (6.2.0)
webmock (3.19.1)
addressable (>= 2.8.0)
Expand All @@ -81,4 +80,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
2.4.19
2.5.5
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020-2023 Georg Ledermann <[email protected]>
Copyright (c) 2020-2024 Georg Ledermann <[email protected]>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ https://github.com/solectrus/hosting

## License

Copyright (c) 2020,2023 Georg Ledermann, released under the MIT License
Copyright (c) 2020-2024 Georg Ledermann, released under the MIT License
2 changes: 1 addition & 1 deletion app/main.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"Version #{ENV.fetch('VERSION', '<unknown>')}, " \
"built at #{ENV.fetch('BUILDTIME', '<unknown>')}"
puts 'https://github.com/solectrus/forecast-collector'
puts 'Copyright (c) 2020,2023 Georg Ledermann, released under the MIT License'
puts 'Copyright (c) 2020-2024 Georg Ledermann, released under the MIT License'
puts "\n"

config = Config.from_env
Expand Down
6 changes: 3 additions & 3 deletions test/forecast_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ def test_fetch_data_success
VCR.use_cassette('forecast_solar_success') do
data = forecast.fetch_data

assert data.is_a?(Hash)
assert_kind_of Hash, data
data.each do |key, value|
assert key.is_a?(Integer)
assert value.is_a?(Integer)
assert_kind_of Integer, key
assert_kind_of Integer, value
end
end
end
Expand Down

0 comments on commit 435952d

Please sign in to comment.