From c8caf95012481b1d8e748a511c95fadf4493b55d Mon Sep 17 00:00:00 2001 From: Luis Mastrangelo Date: Wed, 5 Jun 2024 21:38:31 +0200 Subject: [PATCH] chore: remove the `repository` patch given the patch was included upstream (#194) Signed-off-by: Luis Mastrangelo --- .github/release.yaml | 1 - .github/workflows/push-images.yaml | 5 +---- README.md | 3 +-- h5ai-nginx | 2 +- package.json | 1 - repository.patch | 16 ---------------- 6 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 repository.patch diff --git a/.github/release.yaml b/.github/release.yaml index 557f9712..27f5284e 100644 --- a/.github/release.yaml +++ b/.github/release.yaml @@ -16,7 +16,6 @@ changelog: - title: Breaking Changes 🛠 labels: - breaking-change - - title: Dependency Upgrades labels: - dependencies diff --git a/.github/workflows/push-images.yaml b/.github/workflows/push-images.yaml index c6b2339a..e083d00b 100644 --- a/.github/workflows/push-images.yaml +++ b/.github/workflows/push-images.yaml @@ -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 diff --git a/README.md b/README.md index ba830b8b..4de0c44a 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/h5ai-nginx b/h5ai-nginx index afe19ad4..915dc277 160000 --- a/h5ai-nginx +++ b/h5ai-nginx @@ -1 +1 @@ -Subproject commit afe19ad43b62dfa3235bebea0f1f17d2ef48d895 +Subproject commit 915dc2770a7de62fe9324530791a6677b5475021 diff --git a/package.json b/package.json index 2fa177b7..1abbf707 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/repository.patch b/repository.patch deleted file mode 100644 index ec2a2f13..00000000 --- a/repository.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/select-contract-form/src/App.js b/select-contract-form/src/App.js -index 3979bb8..ded277e 100644 ---- a/select-contract-form/src/App.js -+++ b/select-contract-form/src/App.js -@@ -31,7 +31,10 @@ function App() { - return chainsArray; - }; - getSourcifyChains() -- .then((chains) => setChains(chains)) -+ .then((chains) => { -+ setChains(chains); -+ setChainId(chains[0].chainId); -+ }) - .catch((err) => alert(err)); - }, []); -