Skip to content

Commit

Permalink
Merge branch 'develop' into feature/stale-prs
Browse files Browse the repository at this point in the history
  • Loading branch information
MdNadimHossain authored Nov 14, 2024
2 parents ba2022a + 15dc453 commit c9a39c5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 50 deletions.
21 changes: 0 additions & 21 deletions .circleci/merge-to-reference.sh

This file was deleted.

24 changes: 0 additions & 24 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,34 +5,10 @@ on:
workflow_dispatch:

jobs:
set_status_in_progress:
name: set_status_in_progress
if: always()
uses: dpc-sdp/github-actions/.github/workflows/[email protected]
secrets: inherit
with:
context: 'tide_build'
description: 'Tide Build running...'
state: 'pending'
target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
tide_build:
name: tide_build
secrets: inherit
uses: dpc-sdp/github-actions/.github/workflows/[email protected]
with:
module_build: true
runner: biggy-tide
export_config:
name: export_config
secrets: inherit
uses: dpc-sdp/github-actions/.github/workflows/[email protected]
set_status:
name: set_status
needs: [tide_build]
if: always()
uses: dpc-sdp/github-actions/.github/workflows/[email protected]
secrets: inherit
with:
context: 'tide_build'
description: 'Tide Build'
target_url: ${{ github.event.repository.html_url }}/actions/runs/${{ github.run_id }}
10 changes: 6 additions & 4 deletions src/TideSystemInfoService.php
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,12 @@ function ($entityType) {
*/
public function getPackageVersion($packageName) {
if (empty($packageName)) {
$result = $this->sensorRunner->runSensors([SensorConfig::load('tide_times')]);
$value = $result[0]->getValue();
$decodedValue = json_decode($value, TRUE);
return $decodedValue;
if ($this->sensorRunner) {
$result = $this->sensorRunner->runSensors([SensorConfig::load('tide_times')]);
$value = $result[0]->getValue();
$decodedValue = json_decode($value, TRUE);
return $decodedValue;
}
}

if (strtolower($packageName) === 'php') {
Expand Down
2 changes: 1 addition & 1 deletion tide_core.services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ services:
- '@entity_field.manager'
- '@logger.factory'
- '@file_system'
- '@monitoring.sensor_runner'
- '@?monitoring.sensor_runner'

0 comments on commit c9a39c5

Please sign in to comment.