Skip to content

Commit 7d92ddc

Browse files
Revert "Resolve merge conflict by incorporating both suggestions"
This reverts commit 0d80c70, reversing changes made to f3ebbda.
1 parent 0d80c70 commit 7d92ddc

20 files changed

Lines changed: 7 additions & 918 deletions

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
go-version-file: 'charts/temporal/tests/go.mod'
3030

3131
- name: Set up chart-testing
32-
uses: fairmoney/chart-testing-action@v2.6.1
32+
uses: helm/chart-testing-action@v2.6.1
3333

3434
- name: Add dependency repos
3535
run: |

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,4 @@ If you would like to discuss the Temporal Helm Charts or seek advice about a pot
7373
## Code of Conduct
7474

7575
By participating in this project you agree to abide by the [Temporal Code of Conduct](https://temporal.io/code-of-conduct).
76+

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,4 +598,3 @@ Many thanks to [Banzai Cloud](https://github.com/banzaicloud) whose [Cadence Hel
598598

599599
## License
600600
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Ftemporalio%2Ftemporal-helm-charts.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Ftemporalio%2Ftemporal-helm-charts?ref=badge_large)
601-

charts/temporal/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/charts

charts/temporal/README.md

Lines changed: 0 additions & 114 deletions
This file was deleted.
-11.1 KB
Binary file not shown.
-27.2 KB
Binary file not shown.
-41.7 KB
Binary file not shown.
-77.8 KB
Binary file not shown.

charts/temporal/img/actions3.png

-215 KB
Binary file not shown.

0 commit comments

Comments
 (0)