Skip to content

Commit

Permalink
Merge branch 'develop' into feature/SD-345-quick-exit
Browse files Browse the repository at this point in the history
  • Loading branch information
MdNadimHossain authored Nov 14, 2024
2 parents bd6fa58 + 6b67c71 commit bcefdd7
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 160 deletions.
102 changes: 0 additions & 102 deletions .circleci/config.yml

This file was deleted.

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 }}
21 changes: 21 additions & 0 deletions .github/workflows/pull-request-reviewer-reminder.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: 'Close stale issues and PRs'
on:
workflow_dispatch:
schedule:
- cron: '30 1 * * *'

permissions:
contents: write # only for delete-branch option
issues: write
pull-requests: write

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v9
with:
exempt-pr-labels: "DO NOT MERGE"
stale-issue-message: 'This issue is stale because it has been open 28 days with no activity. Remove stale label or comment or this will be closed in 14 days.'
days-before-stale: 28
days-before-close: 14
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@ class YamlEnhancer extends ResourceFieldEnhancerBase {
*/
protected function doUndoTransform($data, Context $context) {
$data = Yaml::decode($data);
$markup_text = $data['markup']['#markup'];
$processed_text = $data['processed_text']['#text'];

if (!empty($processed_text)) {
$data['processed_text']['#text'] = $this->processText($processed_text);
if (!empty($data['markup']['#markup'])) {
$data['processed_text']['#text'] = $this->processText($data['markup']['#markup']);
}
if (!empty($markup_text)) {
$data['markup']['#markup'] = $this->processText($markup_text);
if (!empty($data['markup']['#markup'])) {
$data['markup']['#markup'] = $this->processText($data['markup']['#markup']);
}

return $data;
Expand Down
3 changes: 2 additions & 1 deletion modules/tide_landing_page/tide_landing_page.install
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ function tide_landing_page_install() {
*/
function tide_landing_page_update_dependencies() {
$dependencies = [];
$dependencies['tide_landing_page'][10102] = ['tide_core' => 10005];
$dependencies['tide_landing_page'][10101] = ['tide_core' => 10005];
$dependencies['tide_landing_page'][10106] = ['tide_core' => 10009];

return $dependencies;
}
Expand Down
2 changes: 1 addition & 1 deletion modules/tide_site/tide_site.install
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function tide_site_install() {
*/
function tide_site_update_10001() {
\Drupal::moduleHandler()->loadInclude('tide_core', 'inc', 'includes/helpers');
$config_location = [\Drupal::service('extension.list.module')->getPath('tide_site') . '/config/install'];
$config_location = [\Drupal::service('extension.list.module')->getPath('tide_core') . '/config/install'];

$configs = [
'field.storage.taxonomy_term.field_additional_comment' => 'field_storage_config',
Expand Down
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
10 changes: 10 additions & 0 deletions tide_core.install
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,16 @@ function tide_core_install() {
$tideCoreOperation->alterParagraphsLibrary();
}

/**
* Implements hook_update_dependencies().
*/
function tide_core_update_dependencies() {
$dependencies = [];
$dependencies['tide_core'][10007] = ['bay_platform_dependencies' => 10003];

return $dependencies;
}

/**
* Increase character limit of URLs.
*/
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 bcefdd7

Please sign in to comment.