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.

Sign up for GitHub

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

Jump to bottom

Update checkpoint files #2070

Merged
merged 5 commits into from Dec 6, 2018
Merged

Update checkpoint files #2070

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9389a8e
Update checkpoint files
ManfredKarrer Dec 6, 2018
428868c
Remove unnecessary checksums
ripcurlx Dec 6, 2018
5bbb8b8
Merge branch 'master' into update-checkpoint-files
ManfredKarrer Dec 6, 2018
647d873
Fix gradle-witness command and hashes
ManfredKarrer Dec 6, 2018
87198f2
Merge remote-tracking branch 'origin/update-checkpoint-files' into up…
ManfredKarrer Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 6 additions & 8 deletions gradle/witness/gradle-witness.gradle
View file
Open in desktop
@@ -1,15 +1,15 @@
// To update the `dependencyVerification` block below:
// To update the `dependencyVerification` block below (we don't add local bisq modules and org.openjfx libraries as
// those cause problems):
//
// 1. Remove the block entirely
// 2. Replace the block with the following command:
//
// ./gradlew -q calculateChecksums | grep -v network.bisq >> gradle/witness/gradle-witness.gradle
// ./gradlew -q calculateChecksums | grep -v 'bisq:\|org.openjfx:' >> gradle/witness/gradle-witness.gradle
//
// 3. Run `git diff` to verify that expected hashes have changed
// 4. Commit the changes
//
// See https://github.com/signalapp/gradle-witness#using-witness for further details.

dependencyVerification {
verify = [
'org.controlsfx:controlsfx:b98f1c9507c05600f80323674b33d15674926c71b0116f70085b62bdacf1e573',
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the checksums for core, p2p and common were introduced by mistake. They are unnecessary and cause the build to fail.

Copy link
Member

Choose a reason for hiding this comment

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

Indeed.

bisq/gradle/witness/gradle-witness.gradle

Line 6 in 9389a8e

// ./gradlew -q calculateChecksums | grep -v network.bisq >> gradle/witness/gradle-witness.gradle
should be changed to exclude bisq: instead of network.bisq libraries.

So it should be change to ... | grep -v 'bisq:'

Copy link
Member Author

Choose a reason for hiding this comment

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

I use now:
./gradlew -q calculateChecksums | grep -v 'bisq:\|org.openjfx:' >> gradle/witness/gradle-witness.gradle

That filters only out the local bisq projectes but not bitcoinj and others as well org.openjfx libs which cause issues.

Expand All @@ -20,25 +20,23 @@ dependencyVerification {
'de.jensd:fontawesomefx-commons:5539bb3335ecb822dbf928546f57766eeb9f1516cc1417a064b5709629612149',
'com.googlecode.jcsv:jcsv:73ca7d715e90c8d2c2635cc284543b038245a34f70790660ed590e157b8714a2',
'com.github.sarxos:webcam-capture:d960b7ea8ec3ddf2df0725ef214c3fccc9699ea7772df37f544e1f8e4fd665f6',
'org.openjfx:javafx-fxml:ef5b10aa0b985e3bece34629bcaf4f462d3a60e1139a83edd116f69c1a36e0e8',
'org.openjfx:javafx-controls:689626346d7b390a46c7acd7741af19f91567110a6611cad50c60d8c611ac59f',
'org.openjfx:javafx-swing:885a5ac37b82913dbfe2ed0742315b6275e8137f19b1135893cae42c4483591b',
'com.jfoenix:jfoenix:4739e37a05e67c3bc9d5b391a1b93717b5a48fa872992616b0964d3f827f8fe6',
'com.github.JesusMcCloud.netlayer:tor.native:f1bf0096f9eb6020645a65d91aa530d15aef97e69cc5a79d7b2405421f74700a',
'com.github.JesusMcCloud.netlayer:tor.external:cfba681398c191a1906d6d023a3be28a8fa9b1f4eee52e966daf7b1ae630414f',
'org.apache.httpcomponents:httpclient:db3d1b6c2d6a5e5ad47577ad61854e2f0e0936199b8e05eb541ed52349263135',
'net.sf.jopt-simple:jopt-simple:6f45c00908265947c39221035250024f2caec9a15c1c8cf553ebeecee289f342',
'org.fxmisc.easybind:easybind:666af296dda6de68751668a62661571b5238ac6f1c07c8a204fc6f902b222aaf',
'network.bisq.btcd-cli4j:btcd-cli4j-daemon:4f56e94428a49290056709f3485a266eacde00a33d41ee995a046fac95eb5c25',
'network.bisq.btcd-cli4j:btcd-cli4j-core:4d1a5637cc89234595ad05f023597bda51fb179c4d1fb296ee94a1106e4fda21',
'com.fasterxml.jackson.core:jackson-databind:fcf3c2b0c332f5f54604f7e27fa7ee502378a2cc5df6a944bbfae391872c32ff',
'com.fasterxml.jackson.core:jackson-core:39a74610521d7fb9eb3f437bb8739bbf47f6435be12d17bf954c731a0c6352bb',
'com.fasterxml.jackson.core:jackson-annotations:2566b3a6662afa3c6af4f5b25006cb46be2efc68f1b5116291d6998a8cdf7ed3',
'org.openjfx:javafx-graphics:753031848484aceead7d8d326be840b592a8de8e5938baabd477847b769eeef4',
'org.openjfx:javafx-base:2b062455f2792c2fc6406bb62d092593c490336584a74d283f8560b58a8eec07',
'com.google.protobuf:protobuf-java:b5e2d91812d183c9f053ffeebcbcda034d4de6679521940a19064714966c2cd4',
'com.google.code.gson:gson:2d43eb5ea9e133d2ee2405cc14f5ee08951b8361302fdd93494a3a997b508d32',
'com.googlecode.json-simple:json-simple:4e69696892b88b41c55d49ab2fdcc21eead92bf54acc588c0050596c3b75199c',
'org.springframework:spring-core:c451e8417adb2ffb2445636da5e44a2f59307c4100037a1fe387c3fba4f29b52',
'ch.qos.logback:logback-classic:e66efc674e94837344bc5b748ff510c37a44eeff86cbfdbf9e714ef2eb374013',
'network.bisq.libdohj:libdohj-core:b89d2a6ad6a5aff1fccf2d4e5f7cc8c31991746e61913bcec3e999c2b0d7c954',
'com.github.bisq-network.bitcoinj:bitcoinj-core:d148d9577cf96540f7f5367011f7626ff9c9f148f0bf903b541740d480652969',
'org.slf4j:slf4j-api:3a4cd4969015f3beb4b5b4d81dbafc01765fb60b8a439955ca64d8476fef553e',
'ch.qos.logback:logback-core:4cd46fa17d77057b39160058df2f21ebbc2aded51d0edcc25d2c1cecc042a005',
Expand Down