Fix secrets detection build step to improve branch detection#9320
Merged
Fix secrets detection build step to improve branch detection#9320
Conversation
| interruptible: true | ||
| variables: | ||
| BRANCH_TAGGING_STRING: "" | ||
| BRANCH_TAGGING_STRING: '' |
Contributor
There was a problem hiding this comment.
There's a few line changes like this, are they needed?
Contributor
Author
There was a problem hiding this comment.
There's a few line changes like this, are they needed?
Not strictly necessary, they're from my Prettier auto-formatter.
We apply Prettier already to a good chunk of the YAML files in this repository and I'd feel semi-strongly that it should be applied / enforced here as well, but absent the tooling for that, I think the occasional manual "sync-up" is okay?
mitchellhenke
approved these changes
Oct 5, 2023
soniaconnolly
approved these changes
Oct 5, 2023
Contributor
soniaconnolly
left a comment
There was a problem hiding this comment.
LGTM, thanks for fixing!
changelog: Internal, Continuous Integration, Add secret scanning job
Merged
jmdembe
added a commit
that referenced
this pull request
Oct 10, 2023
* Fix secrets detection build step to improve branch detection (#9320) * Empty commit * Fetch prior to secrets analyze * Better main detection * s/and/&&/ * Fix "if" syntax * Add changelog changelog: Internal, Continuous Integration, Add secret scanning job * Retire the ProfileMigrationJob (#9322) The ProfileMigrationJob has migrated all of the Profile records that needed migrating so it can be removed [skip changelog] * Bump libphonenumber-js from 1.10.45 to 1.10.46 (#9325) Bumps [libphonenumber-js](https://gitlab.com/catamphetamine/libphonenumber-js) from 1.10.45 to 1.10.46. - [Changelog](https://gitlab.com/catamphetamine/libphonenumber-js/blob/master/CHANGELOG.md) - [Commits](https://gitlab.com/catamphetamine/libphonenumber-js/compare/v1.10.45...v1.10.46) --- updated-dependencies: - dependency-name: libphonenumber-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fix alert paragraph rendering semantics, redundant styling (#9317) * Remove unnecessary text_tag overrides changelog: Bug Fixes, Alerts, Fix HTML semantics for some alerts * Remove redundant margin reset on alert paragraph * Gitignore .bak files (#9324) * Gitignore .bak files Avoid accidentally checking in stray backup files. [skip changelog] * Ignore files with .bak extension --------- Co-authored-by: Andrew Duthie <andrew.duthie@gsa.gov> * Bump libphonenumber-js from 1.10.46 to 1.10.47 (#9332) Bumps [libphonenumber-js](https://gitlab.com/catamphetamine/libphonenumber-js) from 1.10.46 to 1.10.47. - [Changelog](https://gitlab.com/catamphetamine/libphonenumber-js/blob/master/CHANGELOG.md) - [Commits](https://gitlab.com/catamphetamine/libphonenumber-js/compare/v1.10.46...v1.10.47) --- updated-dependencies: - dependency-name: libphonenumber-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update guidance for frontend error logging (#9330) changelog: Internal, Documentation, Update guidance for frontend error logging * Rename ial2_consent_given (3/3) (#9288) Follow on to #9287, removes all references to / support for ial2_consent_given. Should not be merged until that PR is deployed. [skip changelog] * Exclude certain paths from secrets detection (#9337) There are false positives identified when running the Gitlab secret detector locally. [skip changelog] --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Andrew Duthie <andrew.duthie@gsa.gov> Co-authored-by: Jonathan Hooper <jonathan.hooper@gsa.gov> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sonia Connolly <sonia.connolly@gsa.gov> Co-authored-by: Matt Hinz <matt.hinz@gsa.gov>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🛠 Summary of changes
Fixes failing builds caused by git failures in the script.
Borrows liberally from changelog script logic for git branching:
identity-idp/.gitlab-ci.yml
Lines 140 to 152 in 00e4701
Discussion: https://gsa-tts.slack.com/archives/C0NGESUN5/p1696511447586139?thread_ts=1696289942.572699&cid=C0NGESUN5
Previous PR: #9296
📜 Testing Plan
Build should pass.