From 8548dfca96868471f300f130e814c26ddae61b48 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Fri, 20 Mar 2026 08:36:17 +0100
Subject: [PATCH] ci: Move CI related files into own directory

---
 .github/workflows/main.yml                        | 8 ++++----
 CONTRIBUTING.md                                   | 6 +++---
 Dockerfile.arch => ci/Dockerfile.arch             | 0
 Dockerfile.debian => ci/Dockerfile.debian         | 0
 Dockerfile.fedora => ci/Dockerfile.fedora         | 0
 Dockerfile.tumbleweed => ci/Dockerfile.tumbleweed | 0
 Dockerfile.ubuntu => ci/Dockerfile.ubuntu         | 0
 ci-build.sh => ci/ci-build.sh                     | 0
 ci-meson-build.sh => ci/ci-meson-build.sh         | 0
 9 files changed, 7 insertions(+), 7 deletions(-)
 rename Dockerfile.arch => ci/Dockerfile.arch (100%)
 rename Dockerfile.debian => ci/Dockerfile.debian (100%)
 rename Dockerfile.fedora => ci/Dockerfile.fedora (100%)
 rename Dockerfile.tumbleweed => ci/Dockerfile.tumbleweed (100%)
 rename Dockerfile.ubuntu => ci/Dockerfile.ubuntu (100%)
 rename ci-build.sh => ci/ci-build.sh (100%)
 rename ci-meson-build.sh => ci/ci-meson-build.sh (100%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b088b517..7b6ad396 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,8 +23,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: Run tests
         run: |
-          docker build -f Dockerfile.${{ matrix.flavor }} -t profanity .
-          docker run profanity ./ci-build.sh
+          docker build -f ci/Dockerfile.${{ matrix.flavor }} -t profanity .
+          docker run profanity ./ci/ci-build.sh
 
   linux-meson:
     runs-on: ubuntu-latest
@@ -40,8 +40,8 @@ jobs:
         env:
           OMEMO_BACKEND: libomemo-c
         run: |
-          docker build -f Dockerfile.${{ matrix.flavor }} -t profanity .
-          docker run -e OMEMO_BACKEND profanity ./ci-meson-build.sh
+          docker build -f ci/Dockerfile.${{ matrix.flavor }} -t profanity .
+          docker run -e OMEMO_BACKEND profanity ./ci/ci-meson-build.sh
 
   code-style:
     runs-on: ubuntu-22.04
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index aab8f83e..e7a860ac 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ meson setup build_run -Domemo=enabled -Domemo-backend=libomemo-c
 3. Run: `./build_run/profanity`
 
 We also have a [build section](https://profanity-im.github.io/guide/latest/build.html) in our user guide.
-You might also take a look at the `Dockerfile.*` in the root directory.
+You might also take a look at the `Dockerfile.*` in the `ci` directory.
 
 ## Submitting patches
 We recommend for people to always work on a dedicated git branch for each fix or feature.
@@ -180,7 +180,7 @@ snippet to `.git/hooks/pre-push`:
 ```shell
 #!/bin/sh
 set -e
-./ci-build.sh
+./ci/ci-build.sh
 ```
 
 This will run the same tests that the CI runs and refuse the push if it fails.
@@ -202,7 +202,7 @@ In cases where you want to disable automatic formatting for a specific block of
 ## Verification & Testing
 
 ### Running unit tests
-Run `make check` to run the unit tests with your current configuration or `./ci-build.sh` to check with different switches passed to configure.
+Run `make check` to run the unit tests with your current configuration or `./ci/ci-build.sh` to check with different switches passed to configure.
 
 ### Writing unit tests
 We use the [cmocka](https://cmocka.org/) testing framework for unit tests.
diff --git a/Dockerfile.arch b/ci/Dockerfile.arch
similarity index 100%
rename from Dockerfile.arch
rename to ci/Dockerfile.arch
diff --git a/Dockerfile.debian b/ci/Dockerfile.debian
similarity index 100%
rename from Dockerfile.debian
rename to ci/Dockerfile.debian
diff --git a/Dockerfile.fedora b/ci/Dockerfile.fedora
similarity index 100%
rename from Dockerfile.fedora
rename to ci/Dockerfile.fedora
diff --git a/Dockerfile.tumbleweed b/ci/Dockerfile.tumbleweed
similarity index 100%
rename from Dockerfile.tumbleweed
rename to ci/Dockerfile.tumbleweed
diff --git a/Dockerfile.ubuntu b/ci/Dockerfile.ubuntu
similarity index 100%
rename from Dockerfile.ubuntu
rename to ci/Dockerfile.ubuntu
diff --git a/ci-build.sh b/ci/ci-build.sh
similarity index 100%
rename from ci-build.sh
rename to ci/ci-build.sh
diff --git a/ci-meson-build.sh b/ci/ci-meson-build.sh
similarity index 100%
rename from ci-meson-build.sh
rename to ci/ci-meson-build.sh