Skip to content

Commit

Permalink
Merge branch 'release/0.3.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
ledermann committed Aug 30, 2024
2 parents 8f8dfd9 + 2e3da0b commit 35b1408
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: bundle exec rspec

- name: Send test coverage to CodeClimate
uses: paambaati/codeclimate-action@v8.0.0
uses: paambaati/codeclimate-action@v9.0.0
if: ${{ env.CC_TEST_REPORTER_ID }}
with:
coverageCommand: true
Expand Down
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.3.4-alpine AS Builder
FROM ruby:3.3.4-alpine AS builder
RUN apk add --no-cache build-base

WORKDIR /shelly-collector
Expand All @@ -15,21 +15,21 @@ LABEL maintainer="[email protected]"
RUN apk add --no-cache tzdata

# Decrease memory usage
ENV MALLOC_ARENA_MAX 2
ENV MALLOC_ARENA_MAX=2

# Move build arguments to environment variables
ARG BUILDTIME
ENV BUILDTIME ${BUILDTIME}
ENV BUILDTIME=${BUILDTIME}

ARG VERSION
ENV VERSION ${VERSION}
ENV VERSION=${VERSION}

ARG REVISION
ENV REVISION ${REVISION}
ENV REVISION=${REVISION}

WORKDIR /shelly-collector

COPY --from=Builder /usr/local/bundle/ /usr/local/bundle/
COPY --from=builder /usr/local/bundle/ /usr/local/bundle/
COPY . /shelly-collector/

ENTRYPOINT bundle exec app.rb
ENTRYPOINT ["bundle", "exec", "app.rb"]
41 changes: 22 additions & 19 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ GEM
rexml
csv (3.3.0)
diff-lcs (1.5.1)
docile (1.4.0)
docile (1.4.1)
dotenv (3.1.2)
faraday (2.10.0)
faraday-net_http (>= 2.0, < 3.2)
faraday (2.11.0)
faraday-net_http (>= 2.0, < 3.4)
logger
faraday-net_http (3.1.0)
faraday-net_http (3.3.0)
net-http
faraday-request-timer (0.2.0)
faraday (>= 0.9.0)
Expand All @@ -38,7 +38,7 @@ GEM
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
hashdiff (1.1.0)
hashdiff (1.1.1)
influxdb-client (3.1.0)
json (2.7.2)
language_server-protocol (3.17.0.3)
Expand All @@ -54,39 +54,41 @@ GEM
notiffany (0.1.3)
nenv (~> 0.1)
shellany (~> 0.0)
oj (3.16.4)
oj (3.16.5)
bigdecimal (>= 3.0)
parallel (1.25.1)
parser (3.3.4.0)
ostruct (>= 0.2)
ostruct (0.6.0)
parallel (1.26.3)
parser (3.3.4.2)
ast (~> 2.4.1)
racc
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (6.0.0)
racc (1.8.0)
public_suffix (6.0.1)
racc (1.8.1)
rainbow (3.1.1)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
regexp_parser (2.9.2)
rexml (3.3.2)
rexml (3.3.6)
strscan
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.0)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.1)
rspec-expectations (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-support (3.13.1)
rubocop (1.65.0)
rubocop (1.65.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
Expand All @@ -97,14 +99,14 @@ GEM
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.31.3)
rubocop-ast (1.32.1)
parser (>= 3.3.1.0)
rubocop-performance (1.21.1)
rubocop (>= 1.48.1, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rake (0.6.0)
rubocop (~> 1.0)
rubocop-rspec (3.0.3)
rubocop-rspec (3.0.4)
rubocop (~> 1.61)
ruby-progressbar (1.13.0)
shellany (0.0.1)
Expand All @@ -115,10 +117,11 @@ GEM
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
strscan (3.1.0)
thor (1.3.1)
thor (1.3.2)
unicode-display_width (2.5.0)
uri (0.13.0)
vcr (6.2.0)
uri (0.13.1)
vcr (6.3.1)
base64
webmock (3.23.1)
addressable (>= 2.8.0)
crack (>= 0.3.2)
Expand Down Expand Up @@ -148,4 +151,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
2.5.16
2.5.18
14 changes: 7 additions & 7 deletions spec/cassettes/influx-success.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions spec/cassettes/shelly-plug-s.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions spec/cassettes/shelly-pro-3em.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 35b1408

Please sign in to comment.