Skip to content

Commit

Permalink
Merge branch 'main' into feat/reorganize-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
mmarchois authored Jan 22, 2025
2 parents 7499193 + ea1f65f commit bb5beb8
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/metabase_export.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: |
echo "DATABASE_URL=${{ secrets.METABASE_EXPORT_DATABASE_URL }}" >> .env
echo "METABASE_DATABASE_URL=${{ secrets.METABASE_EXPORT_METABASE_DATABASE_URL }}" >> .env
echo "APP_DIALOG_BASE_URL=${{ variables.METABASE_EXPORT_APP_DIALOG_BASE_URL }}" >> .env
echo "APP_DIALOG_BASE_URL=${{ vars.METABASE_EXPORT_APP_DIALOG_BASE_URL }}" >> .env
- name: Run export
run: make ci_metabase_export BIN_PHP="php" BIN_CONSOLE="php bin/console" BIN_COMPOSER="composer"
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function execute(InputInterface $input, OutputInterface $output): int
$report = $this->executor->execute($name, $orgId, $now, $this->reporter);

$output->write($report);
} catch (\RuntimeException $exc) {
} catch (\Exception $exc) {
$output->writeln($exc->getMessage());

$returnCode = Command::FAILURE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public function testExecuteError()
->willReturnCallback(
fn () => match ($matcher->getInvocationCount()) {
1 => 'report1' . PHP_EOL,
2 => throw new \RuntimeException('Failed'),
2 => throw new \Exception('Failed'),
3 => 'report3' . PHP_EOL,
},
);
Expand Down

0 comments on commit bb5beb8

Please sign in to comment.