Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/.ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.6
3.4.7
2 changes: 1 addition & 1 deletion api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM ruby:3.3.6
FROM ruby:3.4.7
RUN apt-get update -qq && apt-get -y install mariadb-client

LABEL org.opencontainers.image.source=https://github.com/dodona-edu/dolos
Expand Down
5 changes: 4 additions & 1 deletion api/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.3.6'
ruby '3.4.7'

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem 'rails', '~> 8.0.2'
Expand All @@ -15,6 +15,9 @@ gem 'puma', '~> 6.6'
# Process ZIP archives
gem 'rubyzip', '~> 2.4.1'

# Parse CSV files
gem 'csv', '~> 3.3', '>= 3.3.5'

# Validate ActiveStorage attachments
gem 'active_storage_validations', '~> 1.4'

Expand Down
4 changes: 3 additions & 1 deletion api/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ GEM
concurrent-ruby (1.3.5)
connection_pool (2.5.3)
crass (1.0.6)
csv (3.3.5)
daemons (1.4.1)
date (3.4.1)
debug (1.10.0)
Expand Down Expand Up @@ -327,6 +328,7 @@ DEPENDENCIES
capistrano-rvm (~> 0.1.2)
capistrano-yarn (~> 2.0.2)
capistrano3-delayed-job (~> 1.7.6)
csv (~> 3.3, >= 3.3.5)
debug
delayed_job_active_record
docker-api (~> 2.4.0)
Expand All @@ -347,7 +349,7 @@ DEPENDENCIES
tzinfo-data

RUBY VERSION
ruby 3.3.6p108
ruby 3.4.7p58

BUNDLED WITH
2.3.26
4 changes: 2 additions & 2 deletions api/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
let
dev = fetchTarball "https://github.com/numtide/devshell/archive/main.tar.gz";
devshell = pkgs.devshell or (import dev { inherit system; });
ruby = pkgs.ruby_3_3;
ruby = pkgs.ruby_3_4;
in
devshell.mkShell {
name = "Dolos API server";
Expand All @@ -19,7 +19,7 @@ devshell.mkShell {
docker-compose
];
language.ruby = {
package = (pkgs.lowPrio ruby);
package = ruby;
nativeDeps = with pkgs; [ libmysqlclient libyaml ];
};
env = [
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

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