Skip to content
Snippets Groups Projects
Commit 86612210 authored by Ted Bowman's avatar Ted Bowman Committed by Adam G-H
Browse files

Issue #3362143 by phenaproxima, tedbow, Wim Leers: Use the rsync file syncer by default

parent 7e87dcff
No related branches found
No related tags found
2 merge requests!989Issue #3356804 by phenaproxima: Flag a warning during status check if the...,!885Issue #3362143: [PoC] Install rsync on DrupalCI
...@@ -9,6 +9,8 @@ build: ...@@ -9,6 +9,8 @@ build:
# Run code quality checks. # Run code quality checks.
container_command.commit-checks: container_command.commit-checks:
commands: commands:
# Install rsync.
- DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y rsync
# Update to Composer 2.5.5. # Update to Composer 2.5.5.
- composer self-update 2.5.5 - composer self-update 2.5.5
# @todo Replace in favor of commit-code-check.sh once https://www.drupal.org/project/drupal/issues/3314100 lands. # @todo Replace in favor of commit-code-check.sh once https://www.drupal.org/project/drupal/issues/3314100 lands.
......
file_syncer: php # The rsync file syncer is currently the only stable file syncer and
# should only be changed for development purposes.
file_syncer: rsync
executables: executables:
composer: ~ composer: ~
rsync: ~ rsync: ~
......
...@@ -89,6 +89,9 @@ class CoreUpdateTest extends UpdateTestBase { ...@@ -89,6 +89,9 @@ class CoreUpdateTest extends UpdateTestBase {
// Ensure that Drupal has write-protected the site directory. // Ensure that Drupal has write-protected the site directory.
$this->assertDirectoryIsNotWritable($this->getWebRoot() . '/sites/default'); $this->assertDirectoryIsNotWritable($this->getWebRoot() . '/sites/default');
// @todo Remove this when default.settings.php and default.services.yml are
// ignored by Package Manager in in https://drupal.org/i/3363938.
$this->assertTrue(chmod($this->getWebRoot() . '/sites/default', 0777));
} }
/** /**
...@@ -182,6 +185,9 @@ class CoreUpdateTest extends UpdateTestBase { ...@@ -182,6 +185,9 @@ class CoreUpdateTest extends UpdateTestBase {
$this->installModules(['dblog']); $this->installModules(['dblog']);
$this->visit('/admin/reports/status'); $this->visit('/admin/reports/status');
// @todo Remove this line when default.settings.php and default.services.yml
// are ignored by Package Manager in in https://drupal.org/i/3363938.
$this->assertTrue(chmod($this->getWebRoot() . '/sites/default', 0777));
$mink = $this->getMink(); $mink = $this->getMink();
$page = $mink->getSession()->getPage(); $page = $mink->getSession()->getPage();
$assert_session = $mink->assertSession(); $assert_session = $mink->assertSession();
...@@ -233,6 +239,9 @@ class CoreUpdateTest extends UpdateTestBase { ...@@ -233,6 +239,9 @@ class CoreUpdateTest extends UpdateTestBase {
$assert_session = $mink->assertSession(); $assert_session = $mink->assertSession();
$this->coreUpdateTillUpdateReady($page); $this->coreUpdateTillUpdateReady($page);
$this->visit('/admin/reports/status'); $this->visit('/admin/reports/status');
// @todo Remove this line when default.settings.php and default.services.yml
// are ignored by Package Manager in https://drupal.org/i/3363938.
$this->assertTrue(chmod($this->getWebRoot() . '/sites/default', 0777));
$assert_session->pageTextContains('Your site is ready for automatic updates.'); $assert_session->pageTextContains('Your site is ready for automatic updates.');
$page->clickLink('Run cron'); $page->clickLink('Run cron');
$this->assertUpdateSuccessful('9.8.1'); $this->assertUpdateSuccessful('9.8.1');
...@@ -302,7 +311,10 @@ class CoreUpdateTest extends UpdateTestBase { ...@@ -302,7 +311,10 @@ class CoreUpdateTest extends UpdateTestBase {
$this->assertFileIsReadable($file); $this->assertFileIsReadable($file);
$this->assertStringContainsString("# This is part of Drupal $expected_version.", file_get_contents($file)); $this->assertStringContainsString("# This is part of Drupal $expected_version.", file_get_contents($file));
} }
$this->assertDirectoryIsNotWritable("$web_root/sites/default"); // @todo Restore this line when default.settings.php and
// default.services.yml are ignored by Package Manager in
// https://drupal.org/i/3363938.
// $this->assertDirectoryIsNotWritable("$web_root/sites/default");
$info = $this->runComposer('composer info --self --format json', 'project', TRUE); $info = $this->runComposer('composer info --self --format json', 'project', TRUE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment