Skip to content

Commit

Permalink
Merge pull request #106 from tigris/ruby-upgrades
Browse files Browse the repository at this point in the history
Upgrade all the rubies - use 3.3 by default
  • Loading branch information
djmattyg007 authored Apr 23, 2024
2 parents 5cd37e3 + 09a07c5 commit 7cef2f7
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
ruby-version: ['2.7', '3.0', '3.1', '3.2']
ruby-version: ['3.1', '3.2', '3.3']

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1-alpine@sha256:499a310e8fab835ad47ab6251302aba1fd6ba91ebdfa22d621f495a5d0ded170 as build
FROM ruby:3.3-alpine@sha256:447495d87e72344ac35f14afd4bebd635eaafcaf3f147ebb72a15fa555b8584e as build

WORKDIR /app
COPY bin /app/bin
Expand All @@ -10,7 +10,7 @@ COPY LICENSE.md /app/
COPY stackup.gemspec /app/
RUN gem build stackup.gemspec

FROM ruby:3.1-alpine@sha256:499a310e8fab835ad47ab6251302aba1fd6ba91ebdfa22d621f495a5d0ded170
FROM ruby:3.3-alpine@sha256:447495d87e72344ac35f14afd4bebd635eaafcaf3f147ebb72a15fa555b8584e

MAINTAINER https://github.com/realestate-com-au/stackup

Expand Down
2 changes: 1 addition & 1 deletion auto/lint
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ cd $(dirname $0)/..

echo "+++ Running linter"
# We lint on the lowest supported ruby version
./auto/ruby-2.7 rubocop
./auto/ruby-3.1 rubocop
2 changes: 1 addition & 1 deletion auto/release-gem
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ git fetch origin
git diff origin/main --exit-code

echo "--- Releasing gem"
docker run --rm -itw /cwd -v "$PWD:/cwd" ruby:3.1-alpine auto/release-in-docker
docker run --rm -itw /cwd -v "$PWD:/cwd" ruby:3.3-alpine auto/release-in-docker
6 changes: 0 additions & 6 deletions auto/ruby-2.7

This file was deleted.

6 changes: 0 additions & 6 deletions auto/ruby-3.0

This file was deleted.

2 changes: 1 addition & 1 deletion auto/ruby-3.1
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
set -eu -o pipefail
cd $(dirname $0)/..

RUBY_IMAGE="ruby:3.1@sha256:ffdb4e42cf4663e10c32d3ea91312b61df931b41439c16f7b88a7f6e70a65b6d" exec auto/ruby "${@}"
RUBY_IMAGE="ruby:3.1@sha256:8ebc619f459ec62a7d0763f910e50787cc7999de3c09632536b22aaf8725d3f1" exec auto/ruby "${@}"
6 changes: 6 additions & 0 deletions auto/ruby-3.2
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

set -eu -o pipefail
cd $(dirname $0)/..

RUBY_IMAGE="ruby:3.2@sha256:9ee6e94ab254ec61fd08472976a8d0a04d9745de76e9768ccd33f0b7d2fd1be9" exec auto/ruby "${@}"
6 changes: 6 additions & 0 deletions auto/ruby-3.3
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env bash

set -eu -o pipefail
cd $(dirname $0)/..

RUBY_IMAGE="ruby:3.3@sha256:8eb6fb9ea8d522506913b420fbaecace30c15f545fb86a8cf7406179e7efa3fd" exec auto/ruby "${@}"
12 changes: 6 additions & 6 deletions auto/test
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
set -eu -o pipefail
cd $(dirname $0)/..

echo "+++ Running specs for ruby 3.1"
./auto/ruby-3.1 rspec
echo "+++ Running specs for ruby 3.3"
./auto/ruby-3.3 rspec

echo "+++ Running specs for ruby 3.0"
./auto/ruby-3.0 rspec
echo "+++ Running specs for ruby 3.2"
./auto/ruby-3.2 rspec

echo "+++ Running specs for ruby 2.7"
./auto/ruby-2.7 rspec
echo "+++ Running specs for ruby 3.1"
./auto/ruby-3.1 rspec

0 comments on commit 7cef2f7

Please sign in to comment.