From 8eb1c9b4a7949d8588ff3b09969f2cb5c036ca8d Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Sun, 5 Dec 2021 17:18:50 +0000
Subject: [PATCH 1/2] build: Remove regex crate

---
 Cargo.deps        | 1 -
 Cargo.deps.legacy | 1 -
 debian/control    | 1 -
 src/lib.rs        | 1 -
 4 files changed, 4 deletions(-)

diff --git a/Cargo.deps b/Cargo.deps
index 6fe72260..99dc7e81 100644
--- a/Cargo.deps
+++ b/Cargo.deps
@@ -1,7 +1,6 @@
 # Dependencies which change based on build flags
 bitflags = "1.2.*"
 clap = { version = "2.33.*", default-features = false }
-regex = { version = "1.3.*", default-features = false, features = ["std", "unicode-case"] }
 
 [dependencies.cairo-rs]
 version = "0.7.*"
diff --git a/Cargo.deps.legacy b/Cargo.deps.legacy
index bfbb50dc..a123f529 100644
--- a/Cargo.deps.legacy
+++ b/Cargo.deps.legacy
@@ -1,7 +1,6 @@
 # Dependencies which change based on build flags
 bitflags = "1.0.*"
 clap = { version = "2.32.*", default-features = false }
-regex = { version = "1.1.*", default-features = false, features = ['use_std'] }
 
 [dependencies.cairo-rs]
 version = "0.5.*"
diff --git a/debian/control b/debian/control
index 149dc343..03db5ffd 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,6 @@ Build-Depends:
  librust-gtk+v3-22-dev (>= 0.5),
  librust-gtk-sys-dev,
  librust-maplit-1-dev (>= 1.0),
- librust-regex-1-dev (>= 1.1),
  librust-serde-derive-1-dev (>= 1.0),
  librust-serde-yaml-0.8-dev (>= 0.8),
  librust-xkbcommon-0.4+wayland-dev (>= 0.4),
diff --git a/src/lib.rs b/src/lib.rs
index a133e9ee..ab86873e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -11,7 +11,6 @@ extern crate gtk_sys;
 #[allow(unused_imports)]
 #[macro_use] // only for tests
 extern crate maplit;
-extern crate regex;
 extern crate serde;
 extern crate xkbcommon;
 

From 6dae43b4376947f8349d43e003738146a2dfabdd Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Sun, 5 Dec 2021 17:18:50 +0000
Subject: [PATCH 2/2] ci: Use bookworm image

The image for x86_64 is a custom one from the registry.
---
 .gitlab-ci.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a14c86eb..ef7826bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: debian:bullseye
+image: $CI_REGISTRY/world/phosh/phosh/debian:v0.0.20211208
 
 stages:
   - build
@@ -6,10 +6,7 @@ stages:
 
 before_script:
   - apt-get -y update
-  - apt-get -y install wget ca-certificates gnupg
-  - echo "deb [trusted=yes] http://ci.puri.sm/ bullseyeci main" > /etc/apt/sources.list.d/ci.list
-  - wget -O- https://ci.puri.sm/ci-repo.key | apt-key add -
-  - apt-get -y update
+  - apt-get -y install ca-certificates
 
 build_docs:
   stage: build
@@ -56,6 +53,7 @@ build_deb:
     - cp ../*.deb .
 
 build_deb:arm64:
+  image: debian:bookworm
   tags:
     - aarch64
   stage: build