From 5edfac3ecf06f3d8f96b190a22878d2cfa36f4e6 Mon Sep 17 00:00:00 2001
From: Egor Tensin <Egor.Tensin@gmail.com>
Date: Sat, 27 Mar 2021 03:28:03 +0300
Subject: .ci: flatten directory structure a bit

---
 .ci/docker/client/output/.gitignore     | 1 +
 .ci/docker/client/var/output/.gitignore | 1 -
 .ci/docker/docker-compose.yml           | 2 +-
 .ci/docker/test.sh                      | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 .ci/docker/client/output/.gitignore
 delete mode 100644 .ci/docker/client/var/output/.gitignore

(limited to '.ci')

diff --git a/.ci/docker/client/output/.gitignore b/.ci/docker/client/output/.gitignore
new file mode 100644
index 0000000..355164c
--- /dev/null
+++ b/.ci/docker/client/output/.gitignore
@@ -0,0 +1 @@
+*/
diff --git a/.ci/docker/client/var/output/.gitignore b/.ci/docker/client/var/output/.gitignore
deleted file mode 100644
index 355164c..0000000
--- a/.ci/docker/client/var/output/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*/
diff --git a/.ci/docker/docker-compose.yml b/.ci/docker/docker-compose.yml
index 2b27bdd..e3bda62 100644
--- a/.ci/docker/docker-compose.yml
+++ b/.ci/docker/docker-compose.yml
@@ -13,4 +13,4 @@ services:
     volumes:
       - ./client/etc/:/etc/cgit-repos:ro
       - "$SSH_AUTH_SOCK:/var/run/cgit-repos/ssh-agent.sock"
-      - ./client/var/output:/var/tmp/cgit-repos/output
+      - ./client/output:/var/tmp/cgit-repos/output
diff --git a/.ci/docker/test.sh b/.ci/docker/test.sh
index 464ec3d..0ff9a35 100755
--- a/.ci/docker/test.sh
+++ b/.ci/docker/test.sh
@@ -116,7 +116,7 @@ verify() {
     echo Checking the pulled repository
     echo ----------------------------------------------------------------------
 
-    pushd -- "$script_dir/client/var/output/test_repo" > /dev/null
+    pushd -- "$script_dir/client/output/test_repo" > /dev/null
     git log --oneline
     popd > /dev/null
 }
-- 
cgit v1.2.3