From 324fb767ac62b9e9a155b30ab9218cf828c27a33 Mon Sep 17 00:00:00 2001
From: Andrew Vella <av603@cam.ac.uk>
Date: Tue, 18 Mar 2025 14:32:10 +0000
Subject: [PATCH 1/2] chore: upgrade ci templates
---
.gitlab/webapp.gitlab-ci.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitlab/webapp.gitlab-ci.yml b/.gitlab/webapp.gitlab-ci.yml
index e375d60..b954e8b 100644
--- a/.gitlab/webapp.gitlab-ci.yml
+++ b/.gitlab/webapp.gitlab-ci.yml
@@ -1,13 +1,13 @@
include:
- project: "uis/devops/continuous-delivery/ci-templates"
file: "/auto-devops/common-pipeline.yml"
- ref: v6.5.0
+ ref: v6.7.2
- project: "uis/devops/continuous-delivery/ci-templates"
file: "/auto-devops/artifact-registry.yml"
- ref: v6.5.0
+ ref: v6.7.2
- project: "uis/devops/continuous-delivery/ci-templates"
file: "/commitlint.yml"
- ref: v6.5.0
+ ref: v6.7.2
variables:
DAST_DISABLED: "1"
--
GitLab
From f9ea0a6be8db61ca816e45245675cb82c1a61347 Mon Sep 17 00:00:00 2001
From: Andrew Vella <av603@cam.ac.uk>
Date: Tue, 18 Mar 2025 14:36:00 +0000
Subject: [PATCH 2/2] build: upgrade ruby
Upgrade Ruby, adding `csv` and `racc` to the `Gemfile` as these are no
longer provided in the Ruby standard library.
---
Dockerfile | 2 +-
Gemfile | 4 +++-
Gemfile.lock | 6 +++++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 3893c55..bf23a13 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
###############################################################################
# `base` image for all downstream images to build upon.
# Make sure the ruby version matches the version in the Gemfile.
-FROM ruby:3.0.7-slim AS base
+FROM ruby:3.4.2-slim AS base
RUN set -eux; \
apt-get -q update; \
diff --git a/Gemfile b/Gemfile
index 4b4b938..52d3d52 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,8 @@
source 'https://rubygems.org'
# Make sure the ruby version matches the version in the Dockerfile.
-ruby '3.0.7'
+ruby '3.4.2'
gem 'gitlab-triage', '~> 1.44', '>= 1.44.3'
+gem 'csv'
+gem 'racc'
diff --git a/Gemfile.lock b/Gemfile.lock
index adc631c..212f763 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,6 +19,7 @@ GEM
bigdecimal (3.1.9)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
+ csv (3.3.2)
drb (2.2.1)
gitlab-triage (1.44.3)
activesupport (>= 5.1)
@@ -46,6 +47,7 @@ GEM
minitest (5.25.4)
multi_xml (0.6.0)
mutex_m (0.3.0)
+ racc (1.8.1)
securerandom (0.3.2)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
@@ -55,10 +57,12 @@ PLATFORMS
ruby
DEPENDENCIES
+ csv
gitlab-triage (~> 1.44, >= 1.44.3)
+ racc
RUBY VERSION
- ruby 3.0.7p220
+ ruby 3.4.2p28
BUNDLED WITH
2.5.23
--
GitLab