Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DX-3112: Fix #4306: Rename acquia-pipelines.yaml #4308

Merged
merged 3 commits into from
Dec 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/blt/deploy/deploy-exclude.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/.idea
/.travis.yml
/.vagrant
/acquia-pipelines.yml
/acquia-pipelines.yaml
/blt.sh
/box
/build
Expand Down
2 changes: 1 addition & 1 deletion scripts/pipelines/build_artifact
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# This file is managed by Composer and should not be modified by end users. To
# override its default behavior, copy it into your project and modify
# acquia-pipelines.yml to call your custom version.
# acquia-pipelines.yaml to call your custom version.

set -ev

Expand Down
3 changes: 1 addition & 2 deletions scripts/pipelines/setup_app
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# This file is managed by Composer and should not be modified by end users. To
# override its default behavior, copy it into your project and modify
# acquia-pipelines.yml to call your custom version.
# acquia-pipelines.yaml to call your custom version.

set -ev

Expand All @@ -10,4 +10,3 @@ export PATH=${COMPOSER_BIN}:$PATH
blt setup --define drush.alias='${drush.aliases.ci}' --no-interaction --ansi --verbose

set +v

2 changes: 1 addition & 1 deletion scripts/pipelines/setup_env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# This file is managed by Composer and should not be modified by end users. To
# override its default behavior, copy it into your project and modify
# acquia-pipelines.yml to call your custom version.
# acquia-pipelines.yaml to call your custom version.

set -ev

Expand Down
2 changes: 1 addition & 1 deletion scripts/pipelines/tests
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# This file is managed by Composer and should not be modified by end users. To
# override its default behavior, copy it into your project and modify
# acquia-pipelines.yml to call your custom version.
# acquia-pipelines.yaml to call your custom version.

set -ev

Expand Down
2 changes: 1 addition & 1 deletion scripts/pipelines/validate
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# This file is managed by Composer and should not be modified by end users. To
# override its default behavior, copy it into your project and modify
# acquia-pipelines.yml to call your custom version.
# acquia-pipelines.yaml to call your custom version.

set -ev

Expand Down
4 changes: 2 additions & 2 deletions src/Robo/Commands/Recipes/CiCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class CiCommand extends BltTasks {
*/
public function pipelinesInit() {
$result = $this->taskFilesystemStack()
->copy($this->getConfigValue('blt.root') . '/scripts/pipelines/acquia-pipelines.yml', $this->getConfigValue('repo.root') . '/acquia-pipelines.yml', TRUE)
->copy($this->getConfigValue('blt.root') . '/scripts/pipelines/acquia-pipelines.yaml', $this->getConfigValue('repo.root') . '/acquia-pipelines.yaml', TRUE)
->stopOnFail()
->setVerbosityThreshold(VerbosityThresholdInterface::VERBOSITY_VERBOSE)
->run();
Expand All @@ -29,7 +29,7 @@ public function pipelinesInit() {
throw new BltException("Could not initialize Acquia Pipelines configuration.");
}

$this->say("<info>A pre-configured acquia-pipelines.yml file was copied to your repository root.</info>");
$this->say("<info>A pre-configured acquia-pipelines.yaml file was copied to your repository root.</info>");
$this->say("<info>To support copying DBs into newly-deployed CDEs, follow these instructions:</info>");
$this->say("<info>https://docs.acquia.com/acquia-cloud/develop/pipelines/cli/install</info>");
}
Expand Down
14 changes: 7 additions & 7 deletions tests/phpunit/Robo/TextMungeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ public function getValueProvider() {
'/.idea',
'/.travis.yml',
'/.vagrant',
'/acquia-pipelines.yml',
'/acquia-pipelines.yaml',
],
[
'/.vagrant',
'/acquia-pipelines.yml',
'/acquia-pipelines.yaml',
'/blt.sh',
'/box',
'/build',
Expand All @@ -55,7 +55,7 @@ public function getValueProvider() {
'/.idea',
'/.travis.yml',
'/.vagrant',
'/acquia-pipelines.yml',
'/acquia-pipelines.yaml',
'/blt.sh',
'/box',
'/build',
Expand All @@ -68,15 +68,15 @@ public function getValueProvider() {
'/.idea',
'/.travis.yml',
'/.vagrant',
'/acquia-pipelines.yml',
'/acquia-pipelines.yaml',
],
[],
[
'/.drush-use',
'/.idea',
'/.travis.yml',
'/.vagrant',
'/acquia-pipelines.yml',
'/acquia-pipelines.yaml',
],
],
[
Expand All @@ -86,14 +86,14 @@ public function getValueProvider() {
'/.idea',
'/.travis.yml',
'/.vagrant',
'/acquia-pipelines.yml',
'/acquia-pipelines.yaml',
],
[
'/.drush-use',
'/.idea',
'/.travis.yml',
'/.vagrant',
'/acquia-pipelines.yml',
'/acquia-pipelines.yaml',
],
],
];
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit/src/CiPipelinesTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class CiPipelinesTest extends BltProjectTestBase {
*/
public function testPipelinesInit() {
$this->blt('recipes:ci:pipelines:init');
$this->assertFileExists($this->sandboxInstance . '/acquia-pipelines.yml');
$this->assertFileExists($this->sandboxInstance . '/acquia-pipelines.yaml');
}

}
2 changes: 1 addition & 1 deletion tests/phpunit/src/WizardTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public function testWizardUsingRecipe() {
$this->assertEquals($recipe['machine_name'], $project_configuration['project']['machine_name']);
$this->assertEquals($recipe['prefix'], $project_configuration['project']['prefix']);
$this->assertEquals($recipe['human_name'], $project_configuration['project']['human_name']);
$this->assertFileExists($this->sandboxInstance . '/acquia-pipelines.yml');
$this->assertFileExists($this->sandboxInstance . '/acquia-pipelines.yaml');
}

}