Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
13 changes: 7 additions & 6 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ on:
branches: [main]
env:
IROHA_GIT: https://github.com/hyperledger-iroha/iroha.git
IROHA_REV: v2.0.0-rc.2.0
IROHA_REV: 884f870a791994cccd62da5febf246a1705eeb48
DENO_VERSION: v2.5.2
jobs:
prep-crypto-wasm:
runs-on: ubuntu-latest
Expand All @@ -32,7 +33,7 @@ jobs:
- uses: denoland/setup-deno@v2
if: steps.prep-cache.outputs.cache-hit != 'true'
with:
deno-version: v2.x
deno-version: ${{ env.DENO_VERSION }}
- name: Build packages
if: steps.prep-cache.outputs.cache-hit != 'true'
run: deno task prep:crypto-wasm
Expand All @@ -50,14 +51,14 @@ jobs:
- uses: actions-rust-lang/setup-rust-toolchain@v1
if: steps.prep-cache.outputs.cache-hit != 'true'
with:
toolchain: 'nightly-2024-09-09'
toolchain: 'nightly-2025-05-08'
target: 'wasm32-unknown-unknown'
components: rust-src
cache: 'false'
- uses: denoland/setup-deno@v2
if: steps.prep-cache.outputs.cache-hit != 'true'
with:
deno-version: v2.x
deno-version: ${{ env.DENO_VERSION }}
- name: Prepare Iroha artifacts
if: steps.prep-cache.outputs.cache-hit != 'true'
run: |
Expand All @@ -83,7 +84,7 @@ jobs:
prep/crypto-wasm
- uses: denoland/setup-deno@v2
with:
deno-version: v2.2.x
deno-version: ${{ env.DENO_VERSION }}
- uses: actions/setup-node@v4
with:
node-version: 22
Expand Down Expand Up @@ -118,7 +119,7 @@ jobs:
prep/crypto-wasm
- uses: denoland/setup-deno@v2
with:
deno-version: v2.2.x
deno-version: ${{ env.DENO_VERSION }}
- uses: actions/setup-node@v4
with:
node-version: 22
Expand Down
5 changes: 4 additions & 1 deletion crypto-wasm/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
[build]
target = "wasm32-unknown-unknown"

[target.wasm32-unknown-unknown]
runner = 'wasm-bindgen-test-runner'
runner = 'wasm-bindgen-test-runner'
4 changes: 3 additions & 1 deletion crypto-wasm/rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
[toolchain]
channel = "nightly-2024-09-09"
channel = "nightly-2025-05-08"
targets = ["wasm32-unknown-unknown"]
components = ["rust-src"]
14 changes: 10 additions & 4 deletions deno.jsonc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"license": "Apache 2.0",
"nodeModulesDir": "auto",
"exclude": ["**/docs"],
"exclude": ["**/docs", "./tmp"],
"workspace": [
"./packages/core",
"./packages/client",
Expand Down Expand Up @@ -35,7 +35,7 @@
"dependencies": ["prep:ok"]
},
"test:deno": {
"command": "deno test -R --doc",
"command": "deno test -RE --doc",
"dependencies": ["prep:ok"]
},
"test:integration:node": {
Expand Down Expand Up @@ -82,17 +82,23 @@
}
},
"imports": {
"@david/dax": "jsr:@david/dax@^0.43.2",
"@deno/vite-plugin": "npm:@deno/vite-plugin@^1.0.3",
"@std/assert": "jsr:@std/assert@^1.0.11",
"@std/async": "jsr:@std/async@^1.0.10",
"@std/encoding": "jsr:@std/encoding@^1.0.7",
"@std/cli": "jsr:@std/cli@^1.0.22",
"@std/crypto": "jsr:@std/crypto@^1.0.5",
"@std/encoding": "jsr:@std/encoding@^1.0.10",
"@std/expect": "jsr:@std/expect@^1.0.13",
"@std/fmt": "jsr:@std/fmt@^1.0.5",
"@std/fs": "jsr:@std/fs@^1.0.19",
"@std/path": "jsr:@std/path@^1.1.2",
"@std/testing": "jsr:@std/testing@^1.0.9",
"@std/text": "jsr:@std/text@^1.0.16",
"@std/toml": "jsr:@std/toml@^1.0.2",
"change-case": "npm:change-case@^5.4.4",
"dprint-node": "npm:dprint-node@^1.0.8",
"fast-equals": "npm:fast-equals@^5.2.2",
"fast-equals": "npm:fast-equals@^5.3.2",
"get-port": "npm:get-port@^7.1.0",
"immutable": "npm:immutable@^5.0.3",
"jake": "npm:jake@^10.9.2",
Expand Down
Loading