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

Ensure help is always loaded during pack creation process #790

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

lcartey
Copy link
Collaborator

@lcartey lcartey commented Oct 31, 2024

Description

The pack creation process loads help files from an external repository during the build process. The existing process will try to find a matching branch in the external repository. For runs triggered by push to a branch (e.g. main, rc/2.37.1 etc.), we will try to find a branch of the same name in the external help repo. For merge groups, we find the base branch name. However, for PRs, we find the name of the PR branch instead. As many PRs do not have equivalent branches in the help repo, this means that pack creation on most PRs do not load any help at all. Therefore the artifacts built on PR check runs often do not have appropriate help.

This PR makes the following changes:

  • The external help ref lookup process now uses the base ref consistently. As per our release process, main and every rc/... branch should exist on the external help repository, thus avoiding failed lookups.
  • Makes not finding the ref in the external help repository a fatal error, to avoid accidentally creating packs without help files if we don't create the appropriate branch in the help repo.

Change request type

  • Release or process automation (GitHub workflows, internal scripts)
  • Internal documentation
  • External documentation
  • Query files (.ql, .qll, .qls or unit tests)
  • External scripts (analysis report or other code shipped as part of a release)

Rules with added or modified queries

  • No rules added
  • Queries have been added for the following rules:
    • rule number here
  • Queries have been modified for the following rules:
    • rule number here

Release change checklist

A change note (development_handbook.md#change-notes) is required for any pull request which modifies:

  • The structure or layout of the release artifacts.
  • The evaluation performance (memory, execution time) of an existing query.
  • The results of an existing query in any circumstance.

If you are only adding new rule queries, a change note is not required.

Author: Is a change note required?

  • Yes
  • No

🚨🚨🚨
Reviewer: Confirm that format of shared queries (not the .qll file, the
.ql file that imports it) is valid by running them within VS Code.

  • Confirmed

Reviewer: Confirm that either a change note is not required or the change note is required and has been added.

  • Confirmed

Query development review checklist

For PRs that add new queries or modify existing queries, the following checklist should be completed by both the author and reviewer:

Author

  • Have all the relevant rule package description files been checked in?
  • Have you verified that the metadata properties of each new query is set appropriately?
  • Do all the unit tests contain both "COMPLIANT" and "NON_COMPLIANT" cases?
  • Are the alert messages properly formatted and consistent with the style guide?
  • Have you run the queries on OpenPilot and verified that the performance and results are acceptable?
    As a rule of thumb, predicates specific to the query should take no more than 1 minute, and for simple queries be under 10 seconds. If this is not the case, this should be highlighted and agreed in the code review process.
  • Does the query have an appropriate level of in-query comments/documentation?
  • Have you considered/identified possible edge cases?
  • Does the query not reinvent features in the standard library?
  • Can the query be simplified further (not golfed!)

Reviewer

  • Have all the relevant rule package description files been checked in?
  • Have you verified that the metadata properties of each new query is set appropriately?
  • Do all the unit tests contain both "COMPLIANT" and "NON_COMPLIANT" cases?
  • Are the alert messages properly formatted and consistent with the style guide?
  • Have you run the queries on OpenPilot and verified that the performance and results are acceptable?
    As a rule of thumb, predicates specific to the query should take no more than 1 minute, and for simple queries be under 10 seconds. If this is not the case, this should be highlighted and agreed in the code review process.
  • Does the query have an appropriate level of in-query comments/documentation?
  • Have you considered/identified possible edge cases?
  • Does the query not reinvent features in the standard library?
  • Can the query be simplified further (not golfed!)

For pull requests the current process attempts to load the help
from the equivalent ref in the help repo. As most PRs do not add
an equivalent branch on the help repo, this means that most PRs
do not load any help at all, and the constructed artifacts are
missing help.

This is problematic during the release process, where we appear to
use the artifacts built from the PR event, instead of the artifacts
built from the branch itself, therefore using artifacts without
any help included.

This commit modifies the behaviour to fetch the help for the base
ref for the pull request or merge group. This should ensure that
help files are always loaded, regardless of where the artifacts
are built.
This is to avoid accidental errors when loading the reference.
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.

1 participant