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.

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

chore: Trestle Release #1787

Merged
merged 6 commits into from
Jan 22, 2025
Merged

chore: Trestle Release #1787

merged 6 commits into from
Jan 22, 2025

Conversation

jpower432
Copy link
Member

Types of changes

  • Hot fix (emergency fix and release)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Documentation (change which affects the documentation site)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Release (develop -> main)

Quality assurance (all should be covered).

  • My code follows the code style of this project.
  • Documentation for my change is up to date?
  • My PR meets testing requirements.
  • All new and existing tests passed.
  • All commits are signed-off.

Summary

Key links:

Before you merge

  • Ensure it is a 'squash commit' if not a release.
  • Ensure CI is currently passing
  • Check sonar. If you are working for a fork a maintainer will reach out, if required.

oscal-compass-bot bot and others added 2 commits December 5, 2024 17:17
@oscal-compass-bot
chore: Merge back version tags and changelog into develop.
5736cea
@dependabot
build(deps): bump paramiko from 3.4.0 to 3.5.0 (#1705)
9327576 
Bumps [paramiko](https://github.com/paramiko/paramiko) from 3.4.0 to 3.5.0.
- [Commits](paramiko/paramiko@3.4.0...3.5.0)

---
updated-dependencies:
- dependency-name: paramiko
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@jpower432 jpower432 requested a review from a team as a code owner December 17, 2024 16:18
AleJo2995
AleJo2995 approved these changes Dec 17, 2024
View reviewed changes
Copy link
Collaborator

@AleJo2995 AleJo2995 left a comment

Choose a reason for hiding this comment

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

LGTM

vikas-agarwal76
vikas-agarwal76 approved these changes Dec 18, 2024
View reviewed changes
Copy link
Collaborator

@vikas-agarwal76 vikas-agarwal76 left a comment

Choose a reason for hiding this comment

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

LGTM

@butler54 @jpower432
fix: activate mike (#1776)
9d5ebf3 
Signed-off-by: Chris Butler <[email protected]>
Co-authored-by: Jennifer Power <[email protected]>
@jpower432
Copy link
Member Author

@AleJo2995 @vikas-agarwal76 I will test with this added commit to see if the calculated version is 3.6.1.

@jpower432
Copy link
Member Author

@AleJo2995 @vikas-agarwal76 I will test with this added commit to see if the calculated version is 3.6.1.

I verified locally that the projected release is 3.6.1.

@jpower432 jpower432 requested a review from butler54 December 19, 2024 16:58
@jpower432 jpower432 marked this pull request as draft January 14, 2025 16:34
@jpower432
Copy link
Member Author

Putting in draft until milestone 3.7.0 completed.

degenaro and others added 3 commits January 16, 2025 08:23
@degenaro
feat: task cis-xlsx-to-oscal-cd (#1764)
8171357 
* task cis-xlsx-to-oscal-cd

Signed-off-by: Lou DeGenaro <[email protected]>

* docs

Signed-off-by: Lou DeGenaro <[email protected]>

* signatures & trace

Signed-off-by: Lou DeGenaro <[email protected]>

* tmpdir

Signed-off-by: Lou DeGenaro <[email protected]>

* hack

Signed-off-by: Lou DeGenaro <[email protected]>

* give up.

Signed-off-by: Lou DeGenaro <[email protected]>

* Fix failing macos pipeline (thanks Vikas!)

Signed-off-by: Lou DeGenaro <[email protected]>

* SortHelper

Signed-off-by: Lou DeGenaro <[email protected]>

* Add debugging try/except

Signed-off-by: Lou DeGenaro <[email protected]>

* 2nd try

Signed-off-by: Lou DeGenaro <[email protected]>

* add utf-8 encoding to open

Signed-off-by: Lou DeGenaro <[email protected]>

* Fix sonar code smells

Signed-off-by: Lou DeGenaro <[email protected]>

* Fix sonar code smells

Signed-off-by: Lou DeGenaro <[email protected]>

* Fix sonar code smells

Signed-off-by: Lou DeGenaro <[email protected]>

* Fix sonar code smells

Signed-off-by: Lou DeGenaro <[email protected]>

* Fix sonar code smells

Signed-off-by: Lou DeGenaro <[email protected]>

* Fix sonar code smells

Signed-off-by: Lou DeGenaro <[email protected]>

* Fix sonar code smells

Signed-off-by: Lou DeGenaro <[email protected]>

* Fix sonar code smells

Signed-off-by: Lou DeGenaro <[email protected]>

* improve test spot checking

Signed-off-by: Lou DeGenaro <[email protected]>

* tests: bad_confg and bad_overwrite

Signed-off-by: Lou DeGenaro <[email protected]>

* simplify & improve test coverage

Signed-off-by: Lou DeGenaro <[email protected]>

* simplify & improve test coverage

Signed-off-by: Lou DeGenaro <[email protected]>

* simplify & improve test coverage

Signed-off-by: Lou DeGenaro <[email protected]>

* simplify & improve test coverage

Signed-off-by: Lou DeGenaro <[email protected]>

* simplify & improve test coverage

Signed-off-by: Lou DeGenaro <[email protected]>

* simplify & improve test coverage

Signed-off-by: Lou DeGenaro <[email protected]>

* simplify & improve test coverage

Signed-off-by: Lou DeGenaro <[email protected]>

* Simplify & improve test coverage

Signed-off-by: Lou DeGenaro <[email protected]>

* Simplify & improve test coverage

Signed-off-by: Lou DeGenaro <[email protected]>

* 100% test coverage!

Signed-off-by: Lou DeGenaro <[email protected]>

* Fix license.

Signed-off-by: Lou DeGenaro <[email protected]>

---------

Signed-off-by: Lou DeGenaro <[email protected]>
@degenaro
fix: release info in docs (#1794)
bdb6444 
* Fix release info in docs.

Signed-off-by: Lou DeGenaro <[email protected]>

* add trestle v0 and generalize current version to 3.x.x

Signed-off-by: Lou DeGenaro <[email protected]>

* specify 0.3.7 explicitly

Signed-off-by: Lou DeGenaro <[email protected]>

* fix: version is 0.37.x

Signed-off-by: Lou DeGenaro <[email protected]>

---------

Signed-off-by: Lou DeGenaro <[email protected]>
@jpower432
fix: updates ssp add-props to replace existing properties (#1801)
b261ead 
* fix: updates ssp add-props to replace existing properties

Signed-off-by: Jennifer Power <[email protected]>

* docs: fixes broken links

Signed-off-by: Jennifer Power <[email protected]>

---------

Signed-off-by: Jennifer Power <[email protected]>
@jpower432 jpower432 marked this pull request as ready for review January 22, 2025 12:34
vikas-agarwal76
vikas-agarwal76 approved these changes Jan 22, 2025
View reviewed changes
Copy link
Collaborator

@vikas-agarwal76 vikas-agarwal76 left a comment

Choose a reason for hiding this comment

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

LGTM

AleJo2995
AleJo2995 approved these changes Jan 22, 2025
View reviewed changes
Copy link
Collaborator

@AleJo2995 AleJo2995 left a comment

Choose a reason for hiding this comment

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

LGTM

@jpower432 jpower432 merged commit 6e33ed2 into main Jan 22, 2025
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vikas-agarwal76 vikas-agarwal76 vikas-agarwal76 approved these changes

@AleJo2995 AleJo2995 AleJo2995 approved these changes

@butler54 butler54 Awaiting requested review from butler54

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jpower432 @AleJo2995 @vikas-agarwal76 @butler54 @degenaro