Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

chore: merge verstion-15-hotfix to version-15 #390

Merged
merged 5 commits into from
Feb 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 32 additions & 0 deletions .github/try-on-f-cloud-button.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion .github/workflows/initiate_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
repo: health
title: |-
"chore: release v${{ matrix.version }}"
body: "Automated beta release."
body: "Automated release."
base: version-${{ matrix.version }}
head: version-${{ matrix.version }}-hotfix
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_dispatch:
push:
branches:
- version-14
- version-15
jobs:
release:
name: Release
Expand Down
4 changes: 2 additions & 2 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"branches": ["version-14"],
"branches": ["version-15"],
"plugins": [
"@semantic-release/commit-analyzer", {
"preset": "angular",
Expand All @@ -10,7 +10,7 @@
"@semantic-release/release-notes-generator",
[
"@semantic-release/exec", {
"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" healthcare/__init__.py'
"prepareCmd": 'sed -ir -E "s/\"[0-9]+\.[0-9]+\.[0-9]+\"/\"${nextRelease.version}\"/" healthcare/__init__.py'
}
],
[
Expand Down
22 changes: 18 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
## Frappe Health

Open source & easy-to-use hospital information system(HIS) for all healthcare organisations.

<div align="center">
<a href="https://frappehealth.com">
<img src="https://raw.githubusercontent.com/frappe/healthcare/develop/healthcare/public/images/healthcare.svg" height="128" alt="Frappe Health Logo">
</a>
<h2>Frappe Health</h2>
<p align="center">
<p>Open source & easy-to-use hospital information system(HIS) for all healthcare organisations.</p>
</p>

[Frappe Health](https://frappehealth.com)

<div align="center" style="max-height: 40px;">
<a href="https://frappecloud.com/healthcare/#">
<img src=".github/try-on-f-cloud-button.svg" height="40">
</a>
</div>

</div>

### Introduction

Expand Down
2 changes: 1 addition & 1 deletion healthcare/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "15.0.0-dev"
__version__ = "15.0.0"
Binary file added healthcare/public/images/healthcare.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions healthcare/public/images/healthcare.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading