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

chore(docs): fix dci-lint failure #2382

Merged
merged 1 commit into from
Apr 11, 2023
Merged

chore(docs): fix dci-lint failure #2382

merged 1 commit into from
Apr 11, 2023

Conversation

ryjones
Copy link
Contributor

@ryjones ryjones commented Apr 7, 2023

Signed-off-by: Ry Jones [email protected]

@ryjones
Copy link
Contributor Author

ryjones commented Apr 7, 2023

@petermetz this is to fix the spurious DCI lint failures

@petermetz
Copy link
Contributor

petermetz commented Apr 8, 2023

@ryjones Suggested edit:

diff --git a/.dcilintignore b/.dcilintignore
index 882b80506..43fd965ea 100644
--- a/.dcilintignore
+++ b/.dcilintignore
@@ -26,3 +26,5 @@ weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hype
 
 # Corda test network files that are generated and therefore cannot be altered to comply with DCI-Lint
 weaver/tests/network-setups/corda/shared
+# Commit messages snuck disallowed terminology into the changelog files.
+CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3188249bf..3c7413dff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 * **git:** broken line endings corrupt git index after weaver merge ([3998ac3](https://github.com/hyperledger/cacti/commit/3998ac3f66dc7c6659583aed64690ebd8812bd7b)), closes [#2302](https://github.com/hyperledger/cacti/issues/2302)
 * link in fabric cli readme ([e14ae88](https://github.com/hyperledger/cacti/commit/e14ae88341dbc5544568e5ac3ebe41568dae280c))
 * logger bug ([122c203](https://github.com/hyperledger/cacti/commit/122c20382fe1ad46d74669d67f3fc5b71e970fbd))
-* rename primary branch to main; rename allowlist ([81e2f9e](https://github.com/hyperledger/cacti/commit/81e2f9ee95f9a0d34090d32966a502018ccbe643))
+* rename master to main; whitelist to allowlist ([81e2f9e](https://github.com/hyperledger/cacti/commit/81e2f9ee95f9a0d34090d32966a502018ccbe643))
 * update ts version; besu-cli sdk imports; added packages test for besu asset exchange in workflow ([ca494b5](https://github.com/hyperledger/cacti/commit/ca494b52ac34e0e8785ca6231dd29695d7584818))
 * workflow besu asset exchange ([2153df8](https://github.com/hyperledger/cacti/commit/2153df89de06f5a725889289254ddde235f1ab74))
 

This way the CHANGELOG.md file isn't broken but the DCI-lint check will still pass afterwards. If we changed the commit message in the changelog file then it would no longer be possible to locate the matching commit on main (and I'm also weary of re-writing the history of main with a force push)

Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

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

@ryjones Please see the above suggestion

Copy link
Contributor

@jagpreetsinghsasan jagpreetsinghsasan left a comment

Choose a reason for hiding this comment

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

LGTM, thankyou for the PR

Copy link
Contributor

@petermetz petermetz left a comment

Choose a reason for hiding this comment

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

@ryjones LGTM, thank you for the updates!

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