Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
automatic_updates
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
automatic_updates
Commits
b27636d3
Commit
b27636d3
authored
11 months ago
by
Ted Bowman
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#3411392
by tedbow: tests fail on core merge requests
parent
68be08a5
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!1100
Issue #3436993: Ensure exceptions are shown if updating extensions and there...
,
!1054
Resolve #3411392 "11 x"
Pipeline
#142993
passed
11 months ago
Stage: build
Stage: validate
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
package_manager/tests/src/Build/TemplateProjectTestBase.php
+3
-1
3 additions, 1 deletion
package_manager/tests/src/Build/TemplateProjectTestBase.php
scripts/src/ConverterCommand.php
+2
-1
2 additions, 1 deletion
scripts/src/ConverterCommand.php
with
5 additions
and
2 deletions
package_manager/tests/src/Build/TemplateProjectTestBase.php
+
3
−
1
View file @
b27636d3
...
@@ -438,13 +438,15 @@ END;
...
@@ -438,13 +438,15 @@ END;
// versions that are newer than the ones being polyfilled, which means we
// versions that are newer than the ones being polyfilled, which means we
// won't be able to build our test project because these polyfills aren't
// won't be able to build our test project because these polyfills aren't
// available in the local code base. Since we're guaranteed to be on PHP
// available in the local code base. Since we're guaranteed to be on PHP
// 8.
1
or later, no package should need to polyfill older versions.
// 8.
3
or later, no package should need to polyfill older versions.
unset
(
unset
(
$requirements
[
'symfony/polyfill-php72'
],
$requirements
[
'symfony/polyfill-php72'
],
$requirements
[
'symfony/polyfill-php73'
],
$requirements
[
'symfony/polyfill-php73'
],
$requirements
[
'symfony/polyfill-php74'
],
$requirements
[
'symfony/polyfill-php74'
],
$requirements
[
'symfony/polyfill-php80'
],
$requirements
[
'symfony/polyfill-php80'
],
$requirements
[
'symfony/polyfill-php81'
],
$requirements
[
'symfony/polyfill-php81'
],
// CORE_MR_ONLY:$requirements['symfony/polyfill-php82'],
// CORE_MR_ONLY:$requirements['symfony/polyfill-php83'],
);
);
// If this package requires any Drupal core packages, ensure it allows
// If this package requires any Drupal core packages, ensure it allows
// any version.
// any version.
...
...
This diff is collapsed.
Click to expand it.
scripts/src/ConverterCommand.php
+
2
−
1
View file @
b27636d3
...
@@ -230,6 +230,7 @@ class ConverterCommand extends Command {
...
@@ -230,6 +230,7 @@ class ConverterCommand extends Command {
*/
*/
private
static
function
executeCommand
(
string
$cmd
):
void
{
private
static
function
executeCommand
(
string
$cmd
):
void
{
$result
=
NULL
;
$result
=
NULL
;
self
::
info
(
"Executing:
$cmd
"
);
system
(
$cmd
,
$result
);
system
(
$cmd
,
$result
);
if
(
$result
!==
0
)
{
if
(
$result
!==
0
)
{
throw
new
\Exception
(
"Command failed:
$cmd
"
);
throw
new
\Exception
(
"Command failed:
$cmd
"
);
...
@@ -604,7 +605,7 @@ class ConverterCommand extends Command {
...
@@ -604,7 +605,7 @@ class ConverterCommand extends Command {
$new_words
=
explode
(
"
\n
"
,
file_get_contents
(
$dict_file_to_merge
));
$new_words
=
explode
(
"
\n
"
,
file_get_contents
(
$dict_file_to_merge
));
$words
=
array_merge
(
$words
,
$new_words
);
$words
=
array_merge
(
$words
,
$new_words
);
$words
=
array_filter
(
array_unique
(
$words
));
$words
=
array_filter
(
array_unique
(
$words
));
nat
case
sort
(
$words
);
natsort
(
$words
);
file_put_contents
(
$dict_file
,
implode
(
"
\n
"
,
$words
)
.
"
\n
"
);
file_put_contents
(
$dict_file
,
implode
(
"
\n
"
,
$words
)
.
"
\n
"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment