From e0389039a485446e6bbd48003289b20faf9dcd56 Mon Sep 17 00:00:00 2001 From: thesayyn Date: Fri, 1 Mar 2024 11:21:59 -0800 Subject: [PATCH 1/2] fix: add shebang --- js/plugin/main.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/plugin/main.js b/js/plugin/main.js index ac2e290..a657b39 100755 --- a/js/plugin/main.js +++ b/js/plugin/main.js @@ -1,3 +1,4 @@ +#!/usr/bin/env node const fs = require("fs"); const plugin = require("./dist/plugin.js"); From e27aa0a61d3c3330d18821b08d63dc2d520c5b1c Mon Sep 17 00:00:00 2001 From: thesayyn Date: Fri, 1 Mar 2024 11:38:02 -0800 Subject: [PATCH 2/2] fix pipeline --- .github/workflows/test.yaml | 35 +++++++++++++++++++---------------- Cargo.lock | 14 +++++++------- Cargo.toml | 5 +++-- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ba5458d..1dedf61 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -6,30 +6,33 @@ on: - '**.md' push: branches: - - master + - main paths-ignore: - '**.md' jobs: test: - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, macos-latest, windows-latest] - node_version: [14.x, 16.x] - protoc_version: [3.x] + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: submodules: true - - uses: actions/setup-node@v2 - with: - node-version: ${{matrix.node_version}} - uses: arduino/setup-protoc@v1 with: - version: ${{matrix.protoc_version}} + version: "3.x" repo-token: ${{ secrets.GITHUB_TOKEN }} - - - run: yarn --frozen-lockfile - - run: yarn codegen - - run: yarn test --test_tag_filters=-no-${{ matrix.os }} - - run: cd examples/pure && yarn --frozen-lockfile && yarn test \ No newline at end of file + + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + with: + registry-url: "https://npm.pkg.github.com" + - uses: actions-rs/toolchain@v1 + with: + toolchain: stable + - uses: jetli/wasm-pack-action@v0.4.0 + - uses: Swatinem/rust-cache@v2 + - name: Install and run cargo-patch + run: | + cargo install cargo-patch + cargo-patch + - name: compile + run: ./infra/compile.sh \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 281a90e..5ccae7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2352,9 +2352,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65f4a8ec18723a734e5dc09c173e0abf9690432da5340285d536edcb4dac190" +checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0" dependencies = [ "once_cell", "protobuf-support", @@ -2363,9 +2363,9 @@ dependencies = [ [[package]] name = "protobuf-codegen" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e85514a216b1c73111d9032e26cc7a5ecb1bb3d4d9539e91fb72a4395060f78" +checksum = "32777b0b3f6538d9d2e012b3fad85c7e4b9244b5958d04a6415f4333782b7a77" dependencies = [ "anyhow", "once_cell", @@ -2378,7 +2378,7 @@ dependencies = [ [[package]] name = "protobuf-parse" -version = "3.3.0" +version = "3.4.0" dependencies = [ "anyhow", "indexmap 1.9.1", @@ -2392,9 +2392,9 @@ dependencies = [ [[package]] name = "protobuf-support" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6872f4d4f4b98303239a2b5838f5bbbb77b01ffc892d627957f37a22d7cfe69c" +checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7" dependencies = [ "thiserror", ] diff --git a/Cargo.toml b/Cargo.toml index 35ecb77..dd22d5b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -50,13 +50,14 @@ serde_json = "1.0.96" [dev-dependencies] glob = "0.3.1" cfg-if = "1.0.0" -protobuf-parse = "3.3.0" +protobuf-parse = "=3.4.0" pretty_assertions_sorted = "1.2.3" [patch.crates-io] -protobuf-parse = { path = './target/patch/protobuf-parse-3.3.0' } +protobuf-parse = { path = './target/patch/protobuf-parse-3.4.0' } [package.metadata.patch.protobuf-parse] +version = "3.4.0" patches = [ { path = "./patches/pure_mod.patch", source = "GithubPrDiff" }, ]