Skip to content

Commit ce51e0e

Browse files
authored
Merge pull request #144 from uswitch/AIRSHIP-4060/snyk-vulnerabilities
AIRSHIP-4060/snyk-vulnerabilities: upgrade ruby and deps
2 parents 7c88509 + 11e95ad commit ce51e0e

File tree

6 files changed

+14
-13
lines changed

6 files changed

+14
-13
lines changed

.github/workflows/push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- uses: ruby/setup-ruby@v1
1818
with:
1919
bundler-cache: true
20-
ruby-version: 3.2.2
20+
ruby-version: 3.4.8
2121
- run: bundle install
2222
- run: rake spec
2323

@@ -29,7 +29,7 @@ jobs:
2929
- uses: ruby/setup-ruby@v1
3030
with:
3131
bundler-cache: true
32-
ruby-version: 3.2.2
32+
ruby-version: 3.4.8
3333
- run: rake version
3434
- run: rake build
3535
- uses: actions/upload-artifact@v4

.github/workflows/tag.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- uses: ruby/setup-ruby@v1
2020
with:
2121
bundler-cache: true
22-
ruby-version: 3.2.2
22+
ruby-version: 3.4.8
2323
- run: rake version
2424
- run: rake build
2525
- uses: actions/upload-artifact@v4
@@ -40,7 +40,7 @@ jobs:
4040
- uses: ruby/setup-ruby@v1
4141
with:
4242
bundler-cache: true
43-
ruby-version: 3.2.2
43+
ruby-version: 3.4.8
4444
- uses: actions/download-artifact@v4
4545
with:
4646
name: pkg

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.4.8

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ruby 3.4.8

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:3.2.2-alpine3.18
1+
FROM ruby:3.4.8-alpine3.23
22

33
ARG TERRAFYING_VERSION=0.0.0
44

@@ -10,12 +10,12 @@ RUN wget -O terraform.zip https://releases.hashicorp.com/terraform/0.11.14/terra
1010

1111
COPY pkg /tmp
1212

13-
RUN apk add --update --no-cache --virtual .terra-builddeps build-base ruby-dev \
14-
&& apk add --update --no-cache --virtual .terra-rundeps git bash \
15-
&& gem install /tmp/terrafying-${TERRAFYING_VERSION}.gem \
16-
&& install -d /terra \
17-
&& apk del .terra-builddeps \
18-
&& rm -rf /var/cache/apk/*
13+
RUN apk add --update --no-cache --virtual .terra-builddeps build-base ruby-dev
14+
RUN apk add --update --no-cache --virtual .terra-rundeps git bash
15+
RUN gem install /tmp/terrafying-${TERRAFYING_VERSION}.gem
16+
RUN install -d /terra
17+
RUN apk del .terra-builddeps
18+
RUN rm -rf /var/cache/apk/*
1919

2020
WORKDIR /terra
2121

terrafying.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ Gem::Specification.new do |spec|
3939
spec.add_runtime_dependency 'deep_merge', '~> 1.1.1'
4040
spec.add_runtime_dependency 'netaddr', '~> 1.5'
4141
spec.add_runtime_dependency 'thor', '~> 1.4.0'
42-
spec.add_runtime_dependency 'xxhash', '~> 0.4.0'
42+
spec.add_runtime_dependency 'xxhash', '~> 0.7.0'
4343
end

0 commit comments

Comments
 (0)