From f5c9ebd7210b7e2193814eb9fef57bbacc488c70 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 30 Dec 2022 17:37:10 +0100 Subject: [PATCH 1/8] ci: add gitleaks --- .woodpecker.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 46b6db6..5a4d7fd 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -18,6 +18,11 @@ pipeline: when: branch: [master, master-*, develop, develop-*] + gitleaks: + image: plugins/gitleaks + settings: + path: . + composer: image: deblan/php:8.1 commands: @@ -31,14 +36,14 @@ pipeline: commands: - ./bin/doctrine-migrate when: - branch: [master, master-*, develop, develop-*] + branch: [master, master-*, develop, develop-*, feature/*] jsroutes: image: deblan/php:8.1 commands: - php bin/console fos:js-routing:dump --format=json --target=public/js/fos_js_routes.json when: - branch: [master, master-*, develop, develop-*] + branch: [master, master-*, develop, develop-*, feature/*] node: image: node:16-slim From 8bfa026678c1db7d09fd670d362b37d604c18b61 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 30 Dec 2022 17:38:20 +0100 Subject: [PATCH 2/8] ci: add gitleaks --- .woodpecker.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 5a4d7fd..c68aefd 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -18,17 +18,17 @@ pipeline: when: branch: [master, master-*, develop, develop-*] - gitleaks: - image: plugins/gitleaks - settings: - path: . - composer: image: deblan/php:8.1 commands: - apt-get update && apt-get -y install git - composer install --no-scripts + gitleaks: + image: plugins/gitleaks + settings: + path: . + migrate: image: deblan/php:8.1 environment: From 748f67945dac62c16ccd3a4fe10561c9317cda6a Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 1 Jan 2023 11:56:28 +0100 Subject: [PATCH 3/8] ci: add timeout step --- .woodpecker.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index c68aefd..4d559dd 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,9 +1,13 @@ pipeline: + wait_db: + image: gitnet.fr/deblan/timeout:latest + commands: + - /bin/timeout -t 30 -c 'while true; do nc -z -v db 3306; sleep 0.5; done' + create_db: image: mariadb:10.3 secrets: [mysqldump] commands: - - sleep 20 - mysql -hdb -uroot -proot -e "CREATE DATABASE app" - eval "$MYSQLDUMP" | mysql -hdb -uroot -proot app when: From 834c7ac15f7729b9c6c02caf1c347e500cb8975f Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 1 Jan 2023 12:07:55 +0100 Subject: [PATCH 4/8] ci: add timeout step --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 4d559dd..fcf7826 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,7 +2,7 @@ pipeline: wait_db: image: gitnet.fr/deblan/timeout:latest commands: - - /bin/timeout -t 30 -c 'while true; do nc -z -v db 3306; sleep 0.5; done' + - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306; sleep 0.5; done' create_db: image: mariadb:10.3 From c81b28d38d453ed772074a183a15841e38b320af Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 1 Jan 2023 12:10:58 +0100 Subject: [PATCH 5/8] ci: add timeout step --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fcf7826..4237099 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,7 +2,7 @@ pipeline: wait_db: image: gitnet.fr/deblan/timeout:latest commands: - - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306; sleep 0.5; done' + - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 | grep succeeded && exit 0 || sleep 0.5; done' create_db: image: mariadb:10.3 From c63b553bc2aa6081988b06193c1f6ff2ef4cd677 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 1 Jan 2023 12:16:07 +0100 Subject: [PATCH 6/8] ci: add timeout step --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 4237099..7297240 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,7 +2,7 @@ pipeline: wait_db: image: gitnet.fr/deblan/timeout:latest commands: - - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 | grep succeeded && exit 0 || sleep 0.5; done' + - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 | grep succeeded && exit 0; sleep 0.5; done' create_db: image: mariadb:10.3 From fe50b09cf3d23e36e9cd08c85a8b40c5a6355f09 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 1 Jan 2023 12:16:26 +0100 Subject: [PATCH 7/8] ci: add timeout step --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 7297240..b684fbb 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -2,7 +2,7 @@ pipeline: wait_db: image: gitnet.fr/deblan/timeout:latest commands: - - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 | grep succeeded && exit 0; sleep 0.5; done' + - /bin/timeout -t 30 -v -c 'while true; do nc -z -v db 3306 2>&1 | grep succeeded && exit 0; sleep 0.5; done' create_db: image: mariadb:10.3 From 60fdfd74cf47ab50fca13c6abe433177587e1199 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Sun, 1 Jan 2023 12:18:51 +0100 Subject: [PATCH 8/8] remove gitleaks --- .woodpecker.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index b684fbb..9bb5415 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -28,11 +28,6 @@ pipeline: - apt-get update && apt-get -y install git - composer install --no-scripts - gitleaks: - image: plugins/gitleaks - settings: - path: . - migrate: image: deblan/php:8.1 environment: