Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

chore: remove the repository patch given the patch was included upstream #194

Merged
merged 2 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
5 changes: 1 addition & 4 deletions .github/workflows/push-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ jobs:

- name: Apply Sourcify server patch customizations
run: npm run server:patch

- name: Apply Sourcify repository patch customizations
run: npm run repository:patch


- name: Get tag
run: |
if [[ "${{ github.event.inputs.version }}" ]]; then
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ These repo submodules are `sourcify` and `h5ai-nginx`, which corresponds to the
Instead of forking those repos, we attach them here directly in order to consume upstream updates more easily.
Given that the `ui` changes are Hedera specific, we decided to keep our [`ui`](./ui/) fork with custom modifications.

Apply the Hedera customization patch to both the `sourcify` and `h5ai-nginx` submodules **(execute this only once)**
Apply the Hedera customization patch to the `sourcify` submodule **(execute this only once)**

```sh
npm run server:patch
npm run repository:patch
```

## Quick Start
Expand Down
2 changes: 1 addition & 1 deletion h5ai-nginx
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"test:server": "mocha test/server.test.js --exit",
"test:hedera": "mocha test/hedera.test.js --exit",
"server:patch": "cd sourcify && git apply --verbose ../server.patch",
"repository:patch": "cd h5ai-nginx && git apply --verbose ../repository.patch",
"server:build": "cd sourcify && npm run build:lerna",
"server:start": "cd sourcify && npm run server:start",
"server:reset-previewnet": "./scripts/hedera-reset.sh previewnet",
Expand Down
16 changes: 0 additions & 16 deletions repository.patch

This file was deleted.