Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix V3 scans for client-side & generate separate VSCode notices bundle #149

Merged

Conversation

MarkAckert
Copy link
Member

@MarkAckert MarkAckert commented Sep 27, 2024

Re-creating #146

  • Moved the notices for zowe-explorer-vscode into a separate zip artifact. Previously the VSCode notices were being included with the zos components.
  • Added --ignore-scripts flag to npm/yarn/pnpm install commands. Since the --prod flag was added in Support PNPM, Respect Lockfiles #145, the prepare script fails for some repos if it requires a dev dep (e.g. husky).
  • Added step to install pnpm in workflow because it was missing from PATH. Not sure why the install script added to Dockerfile in Support PNPM, Respect Lockfiles #145 didn't work.
  • Updated version of ORT in Dockerfile and published a snapshot with test-timothy tag. V15 had several errors causing it to fail parsing Cargo (CLI daemon) and PNPM (ZE) projects that were fixed by upgrading.

@awharn @zFernand0 @traeok Please review the CLI and VSCode artifacts generated by the license workflow.

Copy link
Member

@awharn awharn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, and the bundled licenses look correct. Thanks, @MarkAckert

container:
image: zowe-docker-release.jfrog.io/ompzowe/zowecicd-license-base:latest
image: zowe-docker-snapshot.jfrog.io/ompzowe/zowecicd-license-base:test-timothy
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MarkAckert I'm happy to update the zowe-docker-release latest tag to include the updated ORT and pnpm install step if you'd like 😋

Signed-off-by: MarkAckert <[email protected]>
@MarkAckert MarkAckert merged commit 8b36707 into user/markackert/pnpm-third-try Sep 30, 2024
1 check passed
@MarkAckert MarkAckert deleted the user/timothy/separate-vscode-notices branch September 30, 2024 18:49
MarkAckert added a commit that referenced this pull request Sep 30, 2024
* Reapply "add pnpm support, respect lockfiles"

This reverts commit 2d1046b.

Signed-off-by: MarkAckert <[email protected]>

* Fix V3 scans for client-side & generate separate VSCode notices bundle (#149)

* Generate a separate VSCode notices bundle

Signed-off-by: Timothy Johnson <[email protected]>

* Add --ignore-scripts flag to Node project installs

Signed-off-by: Timothy Johnson <[email protected]>

* Update path-scurry dep to fix yarn build

Signed-off-by: Timothy Johnson <[email protected]>

* Install pnpm@8 in license scan workflow

Signed-off-by: Timothy Johnson <[email protected]>

* Try to upgrade ORT tool

Signed-off-by: Timothy Johnson <[email protected]>

* Test workflow with new image

Signed-off-by: Timothy Johnson <[email protected]>

* Exclude zedc cargo project from ZE licenses

Signed-off-by: Timothy Johnson <[email protected]>

* Update repoRules.json

Signed-off-by: Timothy Johnson <[email protected]>

* update docker image tag

Signed-off-by: MarkAckert <[email protected]>

---------

Signed-off-by: Timothy Johnson <[email protected]>
Signed-off-by: MarkAckert <[email protected]>
Co-authored-by: Timothy Johnson <[email protected]>

---------

Signed-off-by: MarkAckert <[email protected]>
Signed-off-by: Timothy Johnson <[email protected]>
Co-authored-by: Timothy Johnson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants