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

fix(package-json): invalid webpack commit sha #506 #507

Conversation

petermetz
Copy link
Contributor

This commit is necessary because of a rebase that
happened on the fork where the webpack feature we
need was implemented. The rebase changed the commit
sha and therefore made that version of the code
disappear too. To avoid this issue happening again
in the future a dedicated branch was created on the
fork which will not be touched by future rebases
that are necessary for the pull request to be kept
up to date with the main branch of webpack itself.

The so called backup branch mentioned above is called
cactus-webpack-ignore-require-calls-feature which
you can see being specified in the package.json.

Fixes #506

Signed-off-by: Peter Somogyvari peter.somogyvari@accenture.com

This commit is necessary because of a rebase that
happened on the fork where the webpack feature we
need was implemented. The rebase changed the commit
sha and therefore made that version of the code
disappear too. To avoid this issue happening again
in the future a dedicated branch was created on the
fork which will not be touched by future rebases
that are necessary for the pull request to be kept
up to date with the main branch of webpack itself.

The so called backup branch mentioned above is called
cactus-webpack-ignore-require-calls-feature which
you can see being specified in the package.json.

Fixes hyperledger-cacti#506

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
@petermetz petermetz added bug Something isn't working dependencies Pull requests that update a dependency file labels Jan 21, 2021
@petermetz petermetz added this to the v0.4.0 milestone Jan 21, 2021
@petermetz petermetz enabled auto-merge (rebase) January 21, 2021 03:15
petermetz added a commit to petermetz/cacti that referenced this pull request Jan 21, 2021
…dger-cacti#449

The previous commit attempting to do the same thing
somehow did not achieve the expected outcome meaning
that there were still leftovers of other versions of axios.

For reference: CVE-2020-28168

Fixes hyperledger-cacti#449

Depends on hyperledger-cacti#506 hyperledger-cacti#507

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
Copy link
Contributor

@jonathan-m-hamilton jonathan-m-hamilton left a comment

Choose a reason for hiding this comment

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

LGTM

@petermetz petermetz merged commit bcf4a30 into hyperledger-cacti:main Jan 25, 2021
petermetz added a commit to petermetz/cacti that referenced this pull request Jan 26, 2021
…dger-cacti#449

The previous commit attempting to do the same thing
somehow did not achieve the expected outcome meaning
that there were still leftovers of other versions of axios.

For reference: CVE-2020-28168

Fixes hyperledger-cacti#449

Depends on hyperledger-cacti#506 hyperledger-cacti#507

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
petermetz added a commit that referenced this pull request Jan 26, 2021
The previous commit attempting to do the same thing
somehow did not achieve the expected outcome meaning
that there were still leftovers of other versions of axios.

For reference: CVE-2020-28168

Fixes #449

Depends on #506 #507

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
@petermetz petermetz deleted the fix/package-json/invalid-webpack-commit-sha-506 branch January 26, 2021 02:24
ghost pushed a commit to kikoncuo/cactus that referenced this pull request Jan 29, 2021
…dger-cacti#449

The previous commit attempting to do the same thing
somehow did not achieve the expected outcome meaning
that there were still leftovers of other versions of axios.

For reference: CVE-2020-28168

Fixes hyperledger-cacti#449

Depends on hyperledger-cacti#506 hyperledger-cacti#507

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
ghost pushed a commit to kikoncuo/cactus that referenced this pull request Feb 4, 2021
…dger-cacti#449

The previous commit attempting to do the same thing
somehow did not achieve the expected outcome meaning
that there were still leftovers of other versions of axios.

For reference: CVE-2020-28168

Fixes hyperledger-cacti#449

Depends on hyperledger-cacti#506 hyperledger-cacti#507

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
Signed-off-by: Jordi Giron <jordi.giron.amezcua@accenture.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

fix(package-json): invalid webpack commit sha
3 participants