Skip to content

Merge main branch into feature branch #372

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 3 commits into from
Feb 13, 2025
Merged

Merge main branch into feature branch #372

merged 3 commits into from
Feb 13, 2025

Conversation

Achal1607
Copy link
Member

@Achal1607 Achal1607 commented Feb 12, 2025 •
edited
Loading

  • Merge main branch into feature branch to keep it up to date.

sid-srini and others added 3 commits February 11, 2025 07:36
@sid-srini
Ensure that all required packaged files have extensions so that vsixsign
0d9fa3b 
is valid.

1. Added .sh extension to: ant, antRun, mvnDebug, mvnjyp.
2. Added .txt extension to: NOTICE, LICENSE, project-marker-jdk.
3. Ignore nb clusters .lastModified files and node_modules .npmignore
   from vsix packaging.

Signed-off-by: Siddharth Srinivasan <[email protected]>
@sid-srini
Modify vsce npm-module's package command to strip the leading '.'
87f0ce3 
from the file extension string that is populated in
[Content-Types.xml] for the different files in the extension.

Signed-off-by: Siddharth Srinivasan <[email protected]>
@Achal1607
Merge pull request #370 from sid-srini/vsix_ignore_lastModified
e3a8169 
Updated vsix building in order to pass vsixsigntool validation after modified codesigning flow
@Achal1607 Achal1607 requested a review from sid-srini February 12, 2025 15:09
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Feb 12, 2025
sid-srini
sid-srini approved these changes Feb 12, 2025
View reviewed changes
Copy link
Member

@sid-srini sid-srini left a comment

Choose a reason for hiding this comment

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

Thanks. LGTM 👍

@Achal1607 Achal1607 changed the title Merge main branch into telemetry Merge main branch into feature branch Feb 13, 2025
@Achal1607 Achal1607 merged commit 2543b27 into telemetry Feb 13, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sid-srini sid-srini sid-srini approved these changes

Assignees
No one assigned
Labels
OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Achal1607 @sid-srini