From fac1ddacb678fc0c7279bb742589eabbf9c91f42 Mon Sep 17 00:00:00 2001 From: Dominic Grimm Date: Thu, 9 Mar 2023 18:19:53 +0100 Subject: [PATCH] Update crystal version --- .drone.yml | 4 ++-- backend/Dockerfile | 5 +++-- backend/Makefile | 4 +++- backend/micrate/shard.yml | 4 ++-- backend/shard.yml | 4 ++-- backend/src/backend/worker/jobs/assignment_job.cr | 3 +-- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index dcce0ad..5f94086 100644 --- a/.drone.yml +++ b/.drone.yml @@ -46,7 +46,7 @@ steps: - cd backend - ameba micrate/src src - name: deps - image: crystallang/crystal:1.6-alpine + image: crystallang/crystal:1.7.3-alpine volumes: - name: lib path: /drone/src/backend/lib @@ -56,7 +56,7 @@ steps: - cd backend - shards install - name: docs - image: crystallang/crystal:1.6-alpine + image: crystallang/crystal:1.7.3-alpine volumes: - name: lib path: /drone/src/backend/lib diff --git a/backend/Dockerfile b/backend/Dockerfile index 60e77b7..fec411c 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -14,8 +14,9 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -FROM docker.io/crystallang/crystal:1.7.2-alpine as crystal -FROM tdewolff/minify:latest as minify +FROM docker.io/crystallang/crystal:1.7.3-alpine as crystal + +FROM docker.io/tdewolff/minify:latest as minify FROM crystal as micrate-deps WORKDIR /usr/src/micrate diff --git a/backend/Makefile b/backend/Makefile index 9c33eb6..011c0da 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -25,4 +25,6 @@ prod: shards build --production --static --release --verbose -s -p -t docs: - crystal docs --project-name "Mentorenwahl" + crystal docs \ + -s -p -t \ + --project-name="Mentorenwahl" diff --git a/backend/micrate/shard.yml b/backend/micrate/shard.yml index b99e29c..fcd98df 100644 --- a/backend/micrate/shard.yml +++ b/backend/micrate/shard.yml @@ -2,13 +2,13 @@ name: micrate version: 0.1.0 authors: - - Dominic Grimm + - Dominic Grimm targets: micrate: main: src/micrate.cr -crystal: 1.7.2 +crystal: 1.7.3 dependencies: micrate: diff --git a/backend/shard.yml b/backend/shard.yml index 47dc089..292c479 100644 --- a/backend/shard.yml +++ b/backend/shard.yml @@ -18,7 +18,7 @@ name: backend version: 0.1.0 authors: - - Dominic Grimm + - Dominic Grimm license: GPL-3.0 @@ -28,7 +28,7 @@ targets: worker: main: src/bin/worker.cr -crystal: 1.7.2 +crystal: 1.7.3 dependencies: clear: diff --git a/backend/src/backend/worker/jobs/assignment_job.cr b/backend/src/backend/worker/jobs/assignment_job.cr index 5a626b1..d87a2af 100644 --- a/backend/src/backend/worker/jobs/assignment_job.cr +++ b/backend/src/backend/worker/jobs/assignment_job.cr @@ -27,6 +27,7 @@ module Backend end # :ditto: + # ameba:disable Metrics/CyclomaticComplexity def perform : Nil if Db::Config.query.where { active }.first!.can_vote log "Voting still allowed, skipping assignment" @@ -161,8 +162,6 @@ module Backend break if (Time.utc - start_time) > max_span && valid_count > 0 end - pp! best - log "Saving best assignment into database" Db::Assignment.query.where { active }.to_update.set(active: false).execute assignment_id = Db::Assignment.create!({