Skip to content

Commit a0494a4

Browse files
authored
ORT- Add resolutions for hybrid-node-tests and bump versions (valkey-io#2987)
* add resolutions for hybrid-node-tests and bump ORT versions Signed-off-by: BoazBD <[email protected]> * format Signed-off-by: BoazBD <[email protected]> --------- Signed-off-by: BoazBD <[email protected]>
1 parent 94a872b commit a0494a4

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

.github/workflows/ort.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ jobs:
7474
with:
7575
repository: "oss-review-toolkit/ort"
7676
path: "./ort"
77-
ref: "26.0.0"
77+
ref: "44.0.0"
7878
submodules: recursive
7979

8080
- name: Install Rust toolchain
81-
uses: dtolnay/rust-toolchain@1.78
81+
uses: dtolnay/rust-toolchain@1.82
8282

8383
- name: Build and install ORT
8484
if: steps.cache-ort.outputs.cache-hit != 'true'
@@ -100,10 +100,8 @@ jobs:
100100
cat ~/.ort/config/config.yml
101101
102102
### NodeJS ###
103-
- name: Set up Node.js 16.x
103+
- name: Set up Node.js
104104
uses: actions/setup-node@v4
105-
with:
106-
node-version: 16.x
107105

108106
- name: Create package.json file for the Node wrapper
109107
uses: ./.github/workflows/node-create-package-file

node/.ort.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,12 @@ excludes:
77
- pattern: "npm/glide/**"
88
reason: "BUILD_TOOL_OF"
99
comment: "Template file for CD"
10+
11+
resolutions:
12+
issues:
13+
- message: "NPM failed to resolve dependencies for path 'hybrid-node-tests/commonjs-test/package.json': FileNotFoundException: .*valkey-glide/package.json.*"
14+
reason: "BUILD_TOOL_ISSUE"
15+
comment: "The 'hybrid-node-tests' are not built, so there is no 'package.json' in the expected location. The 'valkey-glide' package has already been scanned for licenses, so there's no need to scan it again."
16+
- message: "NPM failed to resolve dependencies for path 'hybrid-node-tests/ecmascript-test/package.json': FileNotFoundException: .*valkey-glide/package.json.*"
17+
reason: "BUILD_TOOL_ISSUE"
18+
comment: "The 'hybrid-node-tests' are not built, so there is no 'package.json' in the expected location. The 'valkey-glide' package has already been scanned for licenses, so there's no need to scan it again."

0 commit comments

Comments
 (0)