Commit Graph

7012 Commits

Author SHA1 Message Date
Zander Mackie
fef5d5bbbd Cleanup go vet error
License: MIT
Signed-off-by: Zander Mackie <zmackie@gmail.com>
2017-02-13 10:11:43 -05:00
Zander Mackie
86c1fb8c96 msfr shouldn't swallow os.IsNotExist
- fsrepo calls and checks for this error (`fsrepo.go:140`)

License: MIT
Signed-off-by: Zander Mackie <zmackie@gmail.com>
2017-02-13 10:11:43 -05:00
Zander Mackie
eb5ba9d761 Tests for msfr
License: MIT
Signed-off-by: Zander Mackie <zmackie@gmail.com>
2017-02-13 10:11:43 -05:00
Jeromy Johnson
4028e89016 Merge pull request #3640 from ipfs/fix/pinset-obj-explosion
Make pinset sharding deterministic
2017-02-12 12:05:32 -08:00
Jeromy Johnson
ac2d7a001d Merge pull request #3684 from ipfs/misc/pull-in-release
Pull in release to master
2017-02-12 11:27:26 -08:00
Jakub Sztandera
3c1382d4dc
Merge remote-tracking branch 'origin/release' into misc/pull-in-release 2017-02-12 20:20:51 +01:00
Jeromy Johnson
79289b6fce Merge pull request #3683 from ipfs/misc/update-version
misc: increase version number to 0.4.6-dev
2017-02-12 11:20:33 -08:00
Jeromy Johnson
755bf3fea5 Merge pull request #3682 from ipfs/release-br/v0.4.5
Merge go-ipfs v0.4.5 release into release branch
2017-02-12 11:16:43 -08:00
Jakub Sztandera
4c20640a04
misc: increase version number to 0.4.6-dev
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 20:08:46 +01:00
Jakub Sztandera
8138536c50 Ipfs release version 0.4.5
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEXOC+rqhs4bQKiCA1h+NN/nLcK2sFAlifnvUACgkQh+NN/nLc
 K2uVHhAAscmiXT8zfKbKY9SRFdKFKArcDKX31DwhKZc2cefiNfFqtkqZylHN7GmJ
 cz1DlsQauip6ihayTEevRE0jFo8BxLluw3N8VoQUI2trMfxjwG4XxjBNnMGIFfwP
 icFyJTPmkDDS7j5e0YY/KDzv2lPfc2QPbP6qNFvFoYSV5bzmCCfOIKN5PIe+miP0
 UQA62eIlh1Pbd5vU3IwrnD4pgTMnC49EtGFREkZecUk4IvY22bdcjkqGSFI2MTjk
 s0BAddmXPoNngm5Q+hCQo4cVrgR2PVNCp8YUFw+6tC2x7DFmHDlkk2sb5u/V2WS7
 niS21i5qC0ySsv/E0MkOj9tYdUno23yS5oewoVnOUZPI7ZhhS+ygq/Sl6DFB6F1a
 Y0SoMJeUY4wKIV8w4lTrz6xBs79eS3p5CYb2h+mXOU2t/5h2u979s172ht8IVt8E
 a3Szac5ENc1JT6JJuEoBSueQEIO413u3Yv0Q7SqppIiHZdponoEhINTCT+HAUj8S
 kLiQFi2v40/mBi1FQivD7WGj91n8Y20b2bZRddhRItp/usGJnFdimTNE2ryklpSz
 zUlJ6GskTuxcwIqoHdSfV6DshXrEvt7mWaapZ55aw9jqXmhWrQxPjpw6NTYhpPWh
 i7eg07g2BnK6gTIYo2OqP9UDVkUBkBE2a/wZ3dGehqF1Pjta/io=
 =NKDX
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEyRnIdIqP/CuNPu76mpr1b4s4eboFAligsZ4ACgkQmpr1b4s4
 ebo1kRAAoczdzPBNfB+U8bgQon80L83ZoEc+SXqMhxIV2aGxTXVgoHQdhnaikq5Y
 gqZkFT7MUyK/uVwCnmQbLvRwMg4H6WY/5m0t2XZ7GtUPIeCTwwQhMyC5LEMgdG5O
 QDpnqCNrMenByf0812Z+EgjXWP3VK0XkZaLdoUeJk7WTuAlM86nXRSowXXNJJx2B
 tS8BiDEqyJOvKXJmCtqBpydyz+HBGv2vi7Osx4VE1KBvciUroWhqwAFPEeaO6YyZ
 VDFbVRx0oE9jqnEnkfZ92JLKlXJ5rojKhqXzdkP0FuCUhS7G6zWQHCqsqmgfKUlV
 6tkbD9iEOUBwJ0XVCmITW4sgr4/c/x9Ja8Qd5cN8JJR2yIXQTyuWIZZ/qKosWmDg
 sfFG4Fggh0IIaVgNQhBSsTMlPsqQlO8OFXUJoXr9yhsLU/FaIyUYNO3JGNSfqfsQ
 0nWe9lyAPScd6vSRGBk+yhgV5GmTQRHHLt1Xsw2t0iRNm130gqemXyoBRKrYkZU2
 JxDWgXEJ6hkUfq4f07OPPy1GAsy9K4kQhcLrHmsctd5+xtY21acNyWXIlOzbJ5Wq
 Kciafkeq9i7IRMVU/0MvBWTbW1I6zSV/+386y+wjKeFHP6PLJW8OzSLNluZKgV4u
 JWcbV+nWeQbkh/Y7tywkiQxD5d2GkJf2kgE7MG3dCc11Ew8iEWE=
 =JVC3
 -----END PGP SIGNATURE-----

Merge tag 'v0.4.5' into release

Ipfs release version 0.4.5
2017-02-12 20:03:55 +01:00
Jeromy Johnson
e8bbc0be31 Merge pull request #3680 from ipfs/feat/makefile/fix-path-in-shell
make: fix PATH escaping
2017-02-12 11:03:24 -08:00
Jakub Sztandera
1d3e039367
make: fix PATH escaping
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 10:26:39 +01:00
Jeromy Johnson
37209f36ab Merge pull request #3663 from elopio/patch-1
add the snap installation instructions
2017-02-11 17:41:31 -08:00
Jeromy Johnson
e1619bf302 Merge pull request #3504 from ipfs/feat/makefile/refactor
Makefile rework and sharness test coverage
2017-02-11 17:26:10 -08:00
Jakub Sztandera
f55206d336
make: reimplement commit ref in version
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 02:14:48 +01:00
Jeromy Johnson
14d518683c Merge pull request #3675 from ipfs/gx/publish/0.4.5
gx publish 0.4.5, cleaner
2017-02-11 16:56:49 -08:00
Jakub Sztandera
1a5c21cd0b
mk/golang: fix multiple tags
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:53:54 +01:00
Jeromy
9e6471fe3c gx publish 0.4.5, cleaner
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2017-02-11 16:35:46 -08:00
Jakub Sztandera
e5a1097d52
Update gx
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:41 +01:00
Jakub Sztandera
dc128cb470
Make gx less verbose
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:41 +01:00
Jakub Sztandera
545f03e9c3
Jenkins CI
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:41 +01:00
Jakub Sztandera
dd63187826
make: make default rule 'aggregate' in sharness
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
a2e3aa5d78
make: fix standalone sharness run
The comparison was wrong

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
f6d70ab541
circleci: separate script to a file
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
c2d100f0ee
make: run coverage when distclean
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
730896c006
make: do not run coverage file unless clean of coverage targets are run
This reduces flat make time by half

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
5472dac317
make: delete gen-make-dep-chain
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
f77d01a965
make: add dummy makefile in sharness directory
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
a15e9fd8c6
make: revert the config showing error change
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
73a711b2df
make: revert the panic change in pin
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
5b4ecae946
cover: do a cross package coverage
Figured out the way to do it much more cheaply, only few % overhead over
normal coverage.

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
cd78168d23
cover: remove Godeps from coverage, add cmd/ipfs to coverage
License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jakub Sztandera
f630222580
make: rework makefiles for non-recursive make and add sharness coverage
This commit introduces non-recursive Makefile infrastructure that replaces current Makefile infrastructure.
It also generally cleanups the Makefiles, separates them into nicer sub-modules and centralizes common operations into single definitions.

It allows to depend on any target that is defined in the makefile, this means that for example `gx install` is called once when `make build test_expensive_sharness` is called instead of 4 or 5 times.

It also makes the dependencies much cleaner and allows for reuse of modules. For example sharness coverage collection (WIP) uses sharness target with amended PATH, previously it might have been possible but not without wiring in the coverage collection into sharness make runner code.

Yes, it is more complex but not much more. There are few rules that have to be followed and few complexities added but IMHO it is worth it.

How to NR-make:
1. If make is to generate some file via a target, it MUST be defined in Rules.mk file in the directory of the target.
2. `Rules.mk` file MUST have `include mk/header.mk` statement as the first line and `include mk/footer.mk` statement as the last line (apart from project root `Rules.mk`).
3. It then MUST be included by the closest `Rules.mk` file up the directory tree.
4. Inside a `Rules.mk` special variable accessed as `$(d)` is defined. Its value is current directory, use it so if the `Rules.mk` file is moved in the tree it still works without a problem. Caution: this variable is not available in the recipe part and MUST NOT be used. Use name of the target or prerequisite to extract it if you need it.
5. Make has only one global scope, this means that name conflicts are a thing. Names SHOULD  follow `VAR_NAME_$(d)` convention. There are exceptions from this rule in form of well defined global variables. Examples: General lists `TGT_BIN`, `CLEAN`; General targets: `TEST`, `COVERAGE`; General variables: `GOFLAGS`, `DEPS_GO`.
3. Any rules, definitions or variables that fit some family SHOULD be defined in `mk/$family.mk` file and included from project root `Rules.mk`

License: MIT
Signed-off-by: Jakub Sztandera <kubuxu@protonmail.ch>
2017-02-12 01:18:40 +01:00
Jeromy Johnson
9efd4c4db7 Merge pull request #3617 from Zanadar/cleanup/offline
Remove 'FindProviders` from routing mocks
2017-02-11 16:14:37 -08:00
Jeromy Johnson
b1f17bf889 Merge pull request #3674 from ipfs/gx/publish/0.4.5
gx publish 0.4.5
2017-02-11 16:13:41 -08:00
Jeromy
1061481aa5 gx publish 0.4.5
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2017-02-11 16:03:48 -08:00
Jeromy Johnson
2cb68b2210 Merge pull request #3673 from ipfs/release-0.4.5
Ipfs 0.4.5
2017-02-11 15:31:13 -08:00
Jeromy
81846eee5f Ipfs 0.4.5
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2017-02-11 13:55:38 -08:00
Jeromy
466429ced3 Ipfs 0.4.5, release candidate 4
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2017-02-10 01:33:38 -08:00
Jeromy Johnson
f330d5d417 Merge pull request #3669 from ipfs/feat/unbreak-webui
feat(webui): update to new version
2017-02-09 12:21:49 -08:00
Jeromy
80d49b82e7 Ipfs 0.4.5, release candidate 3
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2017-02-09 11:14:45 -08:00
Jeromy Johnson
56b85063b7 Merge pull request #3670 from ipfs/fix/dag-cbor-test
fix printing out of binary escaped data for test
2017-02-09 11:10:28 -08:00
Jeromy
c5f0f7f77c fix printing out of binary escaped data for test
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2017-02-09 10:31:18 -08:00
Jeromy Johnson
dc689785a3 Merge pull request #3668 from ipfs/feat/yamux-debugging
Add in env var to enable yamux debug logging
2017-02-09 09:03:06 -08:00
Friedel Ziegelmayer
49c30f6efe feat(webui): update to new version
Closes #3664

License: MIT
Signed-off-by: Friedel <dignifiedquire@gmail.com>
2017-02-09 12:44:30 +01:00
Jeromy
66e1826116 Add in env var to enable yamux debug logging
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2017-02-08 22:36:40 -08:00
Jeromy Johnson
597ba69a0f Merge pull request #3666 from ipfs/fix/cbor-null-arrays
Fix marshaling of null cbor arrays
2017-02-08 17:36:05 -08:00
Jeromy Johnson
0969505e64 Merge pull request #3665 from ipfs/fix/repo-migration-musl
migrations: make libc check more resilient
2017-02-08 17:34:42 -08:00
Jeromy
85a06abacc Fix marshaling of null cbor arrays
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>

Fix non-canonical imports via dag put

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
2017-02-08 16:24:31 -08:00
Lars Gierth
150fe9de76 migrations: make libc check more resilient
Fixes #3661.

There are a couple of cases in which ldd won't operate on an executable,
for example when the executable is statically linked.

This patch makes the call to ldd to ldd more resilient against errors,
and looks for the system libc, instead of the libc go-ipfs was linked against.

License: MIT
Signed-off-by: Lars Gierth <larsg@systemli.org>
2017-02-08 18:56:42 +01:00