Skip to content

Merge main into dev#3077

Merged
sgoggins merged 53 commits intodevfrom
merge-main-into-dev
Apr 1, 2025
Merged

Merge main into dev#3077
sgoggins merged 53 commits intodevfrom
merge-main-into-dev

Conversation

@Ulincsys
Copy link
Copy Markdown
Collaborator

Description
Fix conflicts and merge main into dev

Signed commits

  • Yes, I signed my commits.

sgoggins and others added 30 commits February 11, 2025 20:34
Comment out update weight task as it is no longer needed
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
- Copy keyman directory in Dockerfile
- Update graphical dockerfile to reflect the current build process

Signed-off-by: Ulincsys <ulincsys@gmail.com>
Signed-off-by: Ulincsys <ulincsys@gmail.com>
Fix key orchestrator missing in Docker build
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Ulincsys <ulincsys@gmail.com>
Signed-off-by: Ulincsys <ulincsys@gmail.com>
Signed-off-by: Ulincsys <ulincsys@gmail.com>
- Fix logical issue with try block
- Use multiline string for logging

Signed-off-by: Ulincsys <ulincsys@gmail.com>
Signed-off-by: Ulincsys <ulincsys@gmail.com>
Logging and logical improvements for test_connection decorator
Strip whitespace from keys while loading
Signed-off-by: Ulincsys <ulincsys@gmail.com>
Filter worker_oauth keys by platform in cli
Signed-off-by: Ulincsys <ulincsys@gmail.com>
Signed-off-by: Ulincsys <ulincsys@gmail.com>
Fix comparison with NoneType logical error
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
MoralCode and others added 23 commits February 23, 2025 09:04
Signed-off-by: Adrian Edwards <adrian@adriancedwards.com>
Signed-off-by: Adrian Edwards <adrian@adriancedwards.com>
Signed-off-by: Adrian Edwards <adrian@adriancedwards.com>
Signed-off-by: Adrian Edwards <adrian@adriancedwards.com>
This fixes an issue with scc where the latest version requires a golang update to build.

This also prevents the same happening to scorecard in future

Signed-off-by: Adrian Edwards <adrian@adriancedwards.com>
Signed-off-by: Adrian Edwards <adrian@adriancedwards.com>
Reduce dependency on create_collection_status_record tasks
Signed-off-by: Sean P. Goggins <s@goggins.com>
Signed-off-by: Sean P. Goggins <s@goggins.com>
Hotfix since date issue in collect events task
Signed-off-by: Sean P. Goggins <s@goggins.com>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean P. Goggins <outdoors@acm.org>
Signed-off-by: Sean Goggins <outdoors@acm.org>
[backend] refactor docker container to builder pattern
Signed-off-by: Ulincsys <ulincsys@gmail.com>
@Ulincsys Ulincsys requested a review from ABrain7710 March 19, 2025 21:00
@Ulincsys Ulincsys requested a review from sgoggins as a code owner March 19, 2025 21:00


def cleanup_after_collection_halt(logger, engine):
def cleanup_collection_status_and_rabbit(logger, engine):
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

[pylint] reported by reviewdog 🐶
W0621: Redefining name 'logger' from outer scope (line 35) (redefined-outer-name)

Copy link
Copy Markdown
Collaborator

@sgoggins sgoggins left a comment

Choose a reason for hiding this comment

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

LGTM. This gets us closer to where we need dev to be so I am going to merge it.

@sgoggins sgoggins merged commit 8c3ac66 into dev Apr 1, 2025
8 of 9 checks passed
@MoralCode MoralCode deleted the merge-main-into-dev branch July 10, 2025 23:52
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.

4 participants