Skip to content

Commit

Permalink
Merge branch 'master' into fix/ci/eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
leecalcote authored Jun 21, 2024
2 parents bf12e50 + fd8ab9a commit d704df4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/model-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ jobs:
"Model Generator" <[email protected]>
to: [email protected]
body: |
Meshery's <a href="https://docs.meshery.io/concepts/logical/registry">Model Generator</a> <a href="https://github.com/meshery/meshery/actions/workflows/model-generator.yml">workflow</a> encountered one or more errors. Refer to the attached error log for details or review the [results of the failed workflow](https://github.com/meshery/meshery/actions/runs/${{ github.run_id }}).
The Model Generator workflow (https://github.com/meshery/meshery/actions/workflows/model-generator.yml) encountered one or more errors. Refer to the attached error log for details or review the results of the failed workflow - https://github.com/meshery/meshery/actions/runs/${{ github.run_id }}.
Learn more about the Meshery Registry - https://docs.meshery.io/concepts/logical/registry.
attachments: .meshery/logs/registry/Errors
update-components:
if: github.repository == 'meshery/meshery'
Expand Down
4 changes: 2 additions & 2 deletions docs/_includes/suggested-reading.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<!-- {% if include.section-title != "false" %}
{% if include.section-title != "false" %}
{% if page.layout == "integration" %}
<h2>Related Models in <b>{{ page['integrations-category'] }}</b></h2>
{% else %}
{% assign h2_text = include.h2_text | default: "Suggested Reading" %}
<h2>{{ h2_text }}</h2>
{% endif %}

{% endif %} -->
{% endif %}

{% assign sorted_reading = include.reading | default: site.pages | sort: include.title %}

Expand Down
2 changes: 1 addition & 1 deletion docs/_layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h5>
{% endfor %}
</div>
{% endif %}
{% if page.suggested-reading != false and page.title and page.type and page.category and page.url %}
{% if page.suggested-reading != false and page.title and page.type and page.category and page.url and page.layout != "integration" %}
{% include_cached suggested-reading.html title=page.title type=page.type category=page.category url=page.url language="en" %}
{% endif %}
{% include_cached feedback.html %}
Expand Down

0 comments on commit d704df4

Please sign in to comment.