Skip to content

Commit

Permalink
Merge pull request #149 from betadots/ruby32
Browse files Browse the repository at this point in the history
Update to Ruby 3.2.2
  • Loading branch information
rwaffen authored Apr 11, 2023
2 parents a0a15cd + 1216d78 commit bd3f075
Show file tree
Hide file tree
Showing 28 changed files with 210 additions and 200 deletions.
27 changes: 17 additions & 10 deletions .github/workflows/build_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,25 @@ jobs:
shell: python
run: |
import re
import os
from packaging.version import parse
version = "${{ github.ref }}".replace("refs/tags/v", "")
image = "ghcr.io/${{ github.repository }}"
tags = set()
if version == 'refs/heads/main':
tags.add(f"{image}:development")
else:
tags.add(f"{image}:{version}")
if not parse(version).is_prerelease:
tags.add(f"{image}:latest")
image = "ghcr.io/${{ github.repository }}"
tags = set()
version = "${{ github.ref_name }}"
if version.startswith('v'):
version = "${{ github.ref_name }}".replace("v", "")
tags.add(f"{image}:latest")
if version == 'main':
version = "development"
tags.add(f"{image}:{version}")
tags = ",".join(sorted(list(tags)))
print(f"::set-output name=tags::{tags}")
with open(os.environ['GITHUB_OUTPUT'], 'a') as fh:
print(f'tags={tags}', file=fh)
id: tags

- name: Build and push
Expand Down
1 change: 0 additions & 1 deletion .node-version

This file was deleted.

3 changes: 2 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ inherit_from: .rubocop_todo.yml

require:
- rubocop-rails
- rubocop-capybara

AllCops:
TargetRubyVersion: 2.5
TargetRubyVersion: 3.2
NewCops: enable
Include:
- '**/*.rb'
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.1.3
ruby-3.2.2
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby 3.1.3
ruby 3.2.2
6 changes: 3 additions & 3 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
In case you are using an Apple M1 Chip you might run into trouble building
Ruby. A work around for that is using the command

rvm install 3.1.2 --with-cflags="-Wno-error=implicit-function-declaration"
rvm install 3.2.2 --with-cflags="-Wno-error=implicit-function-declaration"

On intel you can proceed with the following:

rvm install 3.1.2
rvm use 3.1.2
rvm install 3.2.2
rvm use 3.2.2

## **Main part**

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.1.3-slim-bullseye
FROM ruby:3.2.2-slim-bullseye

RUN apt update && apt install -y \
g++ \
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.1.3'
ruby '3.2.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 7.0.0'
Expand Down Expand Up @@ -64,6 +64,7 @@ group :linter do
gem 'rubocop'
gem 'rubocop-rails'
gem 'rubocop-rake'
gem 'rubocop-capybara'
end

group :release do
Expand Down
Loading

0 comments on commit bd3f075

Please sign in to comment.