Skip to content

736: skip mismatching branch for after a new trunk is made #737

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.

Sign up for GitHub

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

Open
asgrim wants to merge 1 commit into
base: 1.6.x
Choose a base branch
from
+5 −0
Open

736: skip mismatching branch for after a new trunk is made #737

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions test/behaviour/CliContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Php\PieBehaviourTest;

use Behat\Behat\Context\Context;
use Behat\Behat\Tester\Exception\PendingException;
use Behat\Hook\AfterScenario;
use Behat\Step\Given;
use Behat\Step\Then;
Expand Down Expand Up @@ -530,6 +531,10 @@ public function iUpdatePIEToTheLatestNightlyVersion(): void
#[Then('I should see I have been updated to the latest version')]
public function iShouldSeeIHaveBeenUpdatedToTheLatestVersion(): void
{
if ($this->exitCode !== 0 && str_contains($this->output . $this->errorOutput, 'Attestation certificate identity mismatch')) {
throw new PendingException('The published nightly PIE release has not yet been rebuilt against the current default branch - skipping');
}

$this->assertCommandSuccessful();
Assert::contains($this->output, '✅ Verified the new PIE version');
Assert::contains($this->output, '✅ PIE has been upgraded to nightly');
Expand Down