From d8051d98baec3bdcbbd8dd392c85b3615e299514 Mon Sep 17 00:00:00 2001 From: Santiago Carmuega Date: Wed, 14 Aug 2024 10:18:00 -0300 Subject: [PATCH 1/3] fix: update nodejs deps --- gen/node/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gen/node/package.json b/gen/node/package.json index 0326bbf..1c6acb0 100644 --- a/gen/node/package.json +++ b/gen/node/package.json @@ -27,9 +27,10 @@ }, "homepage": "https://github.com/utxorpc/spec#readme", "devDependencies": { - "typescript": "^5.1.3" + "typescript": "^5.1.3", + "@bufbuild/buf": "^1.35.1" }, "dependencies": { - "@bufbuild/protobuf": "^1.4" + "@bufbuild/protobuf": "^1.10.0" } } From 1e63d1d4c2dc274a0d235768cea1ed97c4485e6e Mon Sep 17 00:00:00 2001 From: Santiago Carmuega Date: Wed, 14 Aug 2024 10:57:13 -0300 Subject: [PATCH 2/3] fix protoc dep versions --- .github/workflows/generate.yml | 6 ++++-- gen/node/package.json | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 3a7fcf9..885506d 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -29,7 +29,7 @@ jobs: - name: Install node protoc plugins run: | - npm install -g @bufbuild/protoc-gen-es @connectrpc/protoc-gen-connect-es + npm install -g @bufbuild/protoc-gen-es@v1.10 @connectrpc/protoc-gen-connect-es@v1.10 - name: Install Prost from Cargo uses: baptiste0928/cargo-install@v2 @@ -65,7 +65,9 @@ jobs: run: buf generate proto - name: Fix python imports - run: find gen/python/utxorpc_spec -type f -exec sed -i '' 's@from utxorpc@from utxorpc_spec.utxorpc@g' {} \; + run: + find gen/python/utxorpc_spec -type f -exec sed -i '' 's@from + utxorpc@from utxorpc_spec.utxorpc@g' {} \; - name: Create codegen artifact uses: actions/upload-artifact@v4 diff --git a/gen/node/package.json b/gen/node/package.json index 1c6acb0..8cc6c68 100644 --- a/gen/node/package.json +++ b/gen/node/package.json @@ -27,8 +27,7 @@ }, "homepage": "https://github.com/utxorpc/spec#readme", "devDependencies": { - "typescript": "^5.1.3", - "@bufbuild/buf": "^1.35.1" + "typescript": "^5.1.3" }, "dependencies": { "@bufbuild/protobuf": "^1.10.0" From df26546743c66de46898844ee0a142e7f9082822 Mon Sep 17 00:00:00 2001 From: Santiago Carmuega Date: Wed, 14 Aug 2024 10:59:24 -0300 Subject: [PATCH 3/3] for real --- .github/workflows/generate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml index 885506d..7b960a5 100644 --- a/.github/workflows/generate.yml +++ b/.github/workflows/generate.yml @@ -29,7 +29,7 @@ jobs: - name: Install node protoc plugins run: | - npm install -g @bufbuild/protoc-gen-es@v1.10 @connectrpc/protoc-gen-connect-es@v1.10 + npm install -g @bufbuild/protoc-gen-es@v1.10 @connectrpc/protoc-gen-connect-es@v1.4 - name: Install Prost from Cargo uses: baptiste0928/cargo-install@v2