Skip to content

Commit 550b6c2

Browse files
Merge branch '4.1' into 4.2
2 parents bb7d158 + 45f12df commit 550b6c2

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ on:
77

88
jobs:
99
ci:
10+
# Do not run if this is a pull-request from same repo i.e. not a fork repo
11+
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.repository
1012
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1

src/Tasks/MigrationTaskTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ private function publishLinks(): void
317317
if ($shouldPublishLinks) {
318318
$this->print('Publishing links.');
319319
/** @var Versioned&Link $link */
320-
foreach (Link::get()->chunkedFetch() as $link) {
320+
foreach (Link::get()->sort('ID')->chunkedFetch() as $link) {
321321
// Allow developers to skip publishing each link - this allows for scenarios
322322
// where links were Versioned in v2/v3 projects.
323323
$shouldPublishLink = true;

0 commit comments

Comments
 (0)