From 18cde54638c32e1cc54f8e6c0ff1d4c756fae344 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Fri, 25 Feb 2022 21:04:03 -0800 Subject: [PATCH 1/4] Test commit --- seedbox/config/deluge/ggn/docker-compose.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/seedbox/config/deluge/ggn/docker-compose.yml b/seedbox/config/deluge/ggn/docker-compose.yml index 0b5ec8a..17f7814 100644 --- a/seedbox/config/deluge/ggn/docker-compose.yml +++ b/seedbox/config/deluge/ggn/docker-compose.yml @@ -16,4 +16,5 @@ services: - /mnt/torrenting/GGN/0:/downloads - /mnt/torrenting/GGN/0T:/watch -# this is a meaningless comment to test the ci/cd pipeline \ No newline at end of file +# this is a meaningless comment to test the ci/cd pipeline +# new trivial edit \ No newline at end of file From b0c560f10a92cc975aebf1b46b9c54f0e7193c0a Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Fri, 25 Feb 2022 21:07:03 -0800 Subject: [PATCH 2/4] Remove comments --- seedbox/config/deluge/ggn/docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/seedbox/config/deluge/ggn/docker-compose.yml b/seedbox/config/deluge/ggn/docker-compose.yml index 17f7814..d44d4a8 100644 --- a/seedbox/config/deluge/ggn/docker-compose.yml +++ b/seedbox/config/deluge/ggn/docker-compose.yml @@ -15,6 +15,3 @@ services: - $DOCKER_DATA:/config - /mnt/torrenting/GGN/0:/downloads - /mnt/torrenting/GGN/0T:/watch - -# this is a meaningless comment to test the ci/cd pipeline -# new trivial edit \ No newline at end of file From 447ea27c201961f14b8a3cdc7e0a7c9521ea0210 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 26 Feb 2022 05:12:23 +0000 Subject: [PATCH 3/4] Less sophisticated trigger for compose test --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc222a5..0d850ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,8 +17,9 @@ docker-compose-test: stage: test rules: - changes: - - docker-compose.yml - - server/config/minecraft/ + - seedbox/config/ + - server/config/ + - jafner-tools/config/ script: - find ~+ -type f -name docker-compose.yml > composes.txt - find ~+/server/config/minecraft/ -type f -name *.yml >> composes.txt From 7d35c4b51f908a6c71669b677cd66d133099390e Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Sat, 26 Feb 2022 05:18:08 +0000 Subject: [PATCH 4/4] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d850ad..ce25d40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,7 @@ docker-compose-test: - server/config/ - jafner-tools/config/ script: + - git pull - find ~+ -type f -name docker-compose.yml > composes.txt - find ~+/server/config/minecraft/ -type f -name *.yml >> composes.txt - for file in `cat composes.txt`; do docker-compose -f $file config; done