fix issues found with yamllint (630dbe8f) · Commits · boilerplate / ci

.deploy_assets_to_staging.yml

+7 −2

Original line number	Diff line number	Diff line
		@@ -8,7 +8,12 @@
		url: http://wireframes.cetera.ru/$CI_PROJECT_NAME/
		script:
		- rsync -v -e ssh /dev/null root@vps4.cetera.su::wireframe/$CI_PROJECT_NAME/
		- for item in ${LAYOUTS[*]}; do echo $item; rsync -avz --delete --ignore-times --numeric-ids --chown=33:33 -e ssh $CI_PROJECT_DIR/working/$item/dist/ vps4.cetera.su::wireframe/$CI_PROJECT_NAME/$item/; done
		- \|
		for item in ${LAYOUTS[*]}; do
		echo $item
		rsync -avz --delete --ignore-times --numeric-ids --chown=33:33 -e ssh \
		$CI_PROJECT_DIR/working/$item/dist/ vps4.cetera.su::wireframe/$CI_PROJECT_NAME/$item/
		done
		only:
		refs:
		- master

.deploy_code_to_server.yml

+16 −6

Original line number	Diff line number	Diff line
		@@ -8,7 +8,9 @@
		# Proceed only if DOC_ROOT_NAME is set, non-empty, and differs from DEFAULT_DOC_ROOT_NAME
		# and $DEFAULT_DOC_ROOT_NAME directory exists in current working directory
		# and $DOC_ROOT_NAME directory not exists
		if [[ -n "${DOC_ROOT_NAME+x}" && -n "$DOC_ROOT_NAME" && "$DOC_ROOT_NAME" != "$DEFAULT_DOC_ROOT_NAME" && -d "$DEFAULT_DOC_ROOT_NAME" && ! -e "$DOC_ROOT_NAME" ]]; then
		if [[ -n "${DOC_ROOT_NAME+x}" && -n "$DOC_ROOT_NAME" \
		&& "$DOC_ROOT_NAME" != "$DEFAULT_DOC_ROOT_NAME" \
		&& -d "$DEFAULT_DOC_ROOT_NAME" && ! -e "$DOC_ROOT_NAME" ]]; then
		mv "$DEFAULT_DOC_ROOT_NAME" "$DOC_ROOT_NAME"
		echo "renamed www to $DOC_ROOT_NAME"
		fi
		@@ -53,11 +55,16 @@
		# Proceed only if DOC_ROOT_NAME is set, non-empty, and differs from DEFAULT_DOC_ROOT_NAME
		# and $DEFAULT_DOC_ROOT_NAME directory exists in current working directory
		# and $DOC_ROOT_NAME directory not exists
		if [[ -n "${DOC_ROOT_NAME+x}" && -n "$DOC_ROOT_NAME" && "$DOC_ROOT_NAME" != "$DEFAULT_DOC_ROOT_NAME" && -d "$DEFAULT_DOC_ROOT_NAME" && ! -e "$DOC_ROOT_NAME" ]]; then
		if [[ -n "${DOC_ROOT_NAME+x}" && -n "$DOC_ROOT_NAME" \
		&& "$DOC_ROOT_NAME" != "$DEFAULT_DOC_ROOT_NAME" \
		&& -d "$DEFAULT_DOC_ROOT_NAME" && ! -e "$DOC_ROOT_NAME" ]]; then
		mv "$DEFAULT_DOC_ROOT_NAME" "$DOC_ROOT_NAME"
		echo "renamed www to $DOC_ROOT_NAME"
		fi
		- rsync --links --safe-links -avz --chown=$user:$group -e "ssh $SSH_OPTS" --filter="merge rsync-filter-std" --filter="merge $PROJECT_FILTER" $RSYNC_PARAMS $CI_PROJECT_DIR/ $DEPLOY_HOST_PATH/
		- \|
		rsync --links --safe-links -avz --chown=$user:$group -e "ssh $SSH_OPTS" \
		--filter="merge rsync-filter-std" --filter="merge $PROJECT_FILTER" \
		$RSYNC_PARAMS $CI_PROJECT_DIR/ $DEPLOY_HOST_PATH/
		after_script:
		- \|
		if [[ $PROJECT_CMS_TYPE = bitrix && $SKIP_SETTINGS_EXTRA_DEPLOYMENT != true ]]; then
		@@ -76,7 +83,10 @@
		deploy_autotests_to_server:
		extends: .before_deploy_code
		script:
		- rsync -avz --delete --chown=www-data:www-data -e "ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key" $CI_PROJECT_DIR/autotests/ root@vps6.cetera.ru::www/autotest.cetera.su/projects/$CI_PROJECT_NAME/;
		- \|
		rsync -avz --delete --chown=www-data:www-data \
		-e "ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i $HOME/.ssh/deploy.key" \
		$CI_PROJECT_DIR/autotests/ root@vps6.cetera.ru::www/autotest.cetera.su/projects/$CI_PROJECT_NAME/
		only:
		refs:
		- master

.deploy_composer_files_to_server.yml

+6 −5

Original line number	Diff line number	Diff line
		.upload_composer_files: &upload_composer_files \|
		if [ -d "$CI_PROJECT_DIR/$COMPOSER_ARTIFACTS_DIR" ];
		then
		echo "RUNNING rsync -L -avz $RSYNC_PARAMS --chown=$user:$group -e "ssh $SSH_OPTS" $CI_PROJECT_DIR/$COMPOSER_ARTIFACTS_DIR $DEPLOY_HOST_PATH/$COMPOSER_SERVER_DIR;"
		echo "RUNNING rsync -L -avz $RSYNC_PARAMS" \
		"--chown=$user:$group -e ssh" \
		"$CI_PROJECT_DIR/$COMPOSER_ARTIFACTS_DIR $DEPLOY_HOST_PATH/$COMPOSER_SERVER_DIR"
		rsync -L -avz $RSYNC_PARAMS --chown=$user:$group -e "ssh $SSH_OPTS" $CI_PROJECT_DIR/$COMPOSER_ARTIFACTS_DIR $DEPLOY_HOST_PATH/$COMPOSER_SERVER_DIR;
		fi

		@@ -9,12 +11,11 @@
		extends: .before_deploy_code
		variables:
		RSYNC_PARAMS: '--delete'
		COMPOSER_ARTIFACTS_DIR: vendor/
		COMPOSER_SERVER_DIR: vendor/
		dependencies:
		- build_composer
		- setup_environment_vars
		variables:
		COMPOSER_ARTIFACTS_DIR: vendor/
		COMPOSER_SERVER_DIR: vendor/
		script:
		- *upload_composer_files
		only:

test.yml

+5 −2

Original line number	Diff line number	Diff line
		@@ -47,7 +47,10 @@
		case $PROJECT_CMS_TYPE in
		bitrix)
		echo "Using Bitrix rules for phpcs"
		/composer/vendor/bin/phpcs --encoding=utf-8 --extensions=php --ignore=$CI_PROJECT_DIR/vendor --standard=PSR1,PSR12 --exclude=PSR1.Methods.CamelCapsMethodName,PSR1.Files.SideEffects,PSR1.Classes.ClassDeclaration,Squiz.Classes.ValidClassName $CI_PROJECT_DIR
		/composer/vendor/bin/phpcs --encoding=utf-8 --extensions=php \
		--ignore=$CI_PROJECT_DIR/vendor --standard=PSR1,PSR12 \
		--exclude=PSR1.Methods.CamelCapsMethodName,PSR1.Files.SideEffects,PSR1.Classes.ClassDeclaration,Squiz.Classes.ValidClassName \
		$CI_PROJECT_DIR
		;;
		ceteracms)
		echo "Using CeteraCMS rules for phpcs"

gitlab-ci-template.yml

+11 −11

File changed.

Contains only whitespace changes.

.build_assets.yml

+3 −3

File changed.

Contains only whitespace changes.

.build_composer.yml

+2 −2

File changed.

Contains only whitespace changes.

before_script.yml

+9 −9

File changed.

Contains only whitespace changes.