Skip to content

Commit

Permalink
ORT- Add resolutions for hybrid-node-tests and bump versions (#2987)
Browse files Browse the repository at this point in the history
* 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]>
  • Loading branch information
BoazBD authored Jan 23, 2025
1 parent 94a872b commit a0494a4
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
8 changes: 3 additions & 5 deletions .github/workflows/ort.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ jobs:
with:
repository: "oss-review-toolkit/ort"
path: "./ort"
ref: "26.0.0"
ref: "44.0.0"
submodules: recursive

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@1.78
uses: dtolnay/rust-toolchain@1.82

- name: Build and install ORT
if: steps.cache-ort.outputs.cache-hit != 'true'
Expand All @@ -100,10 +100,8 @@ jobs:
cat ~/.ort/config/config.yml
### NodeJS ###
- name: Set up Node.js 16.x
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 16.x

- name: Create package.json file for the Node wrapper
uses: ./.github/workflows/node-create-package-file
Expand Down
9 changes: 9 additions & 0 deletions node/.ort.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,12 @@ excludes:
- pattern: "npm/glide/**"
reason: "BUILD_TOOL_OF"
comment: "Template file for CD"

resolutions:
issues:
- message: "NPM failed to resolve dependencies for path 'hybrid-node-tests/commonjs-test/package.json': FileNotFoundException: .*valkey-glide/package.json.*"
reason: "BUILD_TOOL_ISSUE"
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."
- message: "NPM failed to resolve dependencies for path 'hybrid-node-tests/ecmascript-test/package.json': FileNotFoundException: .*valkey-glide/package.json.*"
reason: "BUILD_TOOL_ISSUE"
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 comments on commit a0494a4

Please sign in to comment.