-
-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into chore/bump-webui
- Loading branch information
Showing
93 changed files
with
2,541 additions
and
1,191 deletions.
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,8 +58,8 @@ executors: | |
IPFS_REUSEPORT: false | ||
LIBP2P_ALLOW_WEAK_RSA_KEYS: 1 | ||
E2E_IPFSD_TYPE: go | ||
dockerizer: | ||
docker: | ||
dockerizer: | ||
docker: | ||
- image: circleci/golang:1.14.4 | ||
environment: | ||
IMAGE_NAME: ipfs/go-ipfs | ||
|
@@ -100,7 +100,7 @@ jobs: | |
- run: | | ||
make -j 1 test/unit/gotest.junit.xml \ | ||
&& [[ ! $(jq -s -c 'map(select(.Action == "fail")) | .[]' test/unit/gotest.json) ]] | ||
- run: | ||
- run: | ||
when: always | ||
command: bash <(curl -s https://codecov.io/bash) -cF unittests -X search -f coverage/unit_tests.coverprofile | ||
|
||
|
@@ -170,36 +170,20 @@ jobs: | |
- *make_out_dirs | ||
- attach_workspace: | ||
at: /tmp/circleci-workspace | ||
- run: | ||
name: Cloning | ||
command: | | ||
git clone https://github.com/ipfs/interop.git | ||
git -C interop log -1 | ||
- restore_cache: | ||
keys: | ||
- v2-interop-{{ checksum "~/ipfs/go-ipfs/interop/package-lock.json" }} | ||
- v2-interop- | ||
- run: | ||
name: Installing dependencies | ||
command: | | ||
npm install | ||
working_directory: ~/ipfs/go-ipfs/interop | ||
- save_cache: | ||
key: v2-interop-{{ checksum "~/ipfs/go-ipfs/interop/package-lock.json" }} | ||
paths: | ||
- ~/ipfs/go-ipfs/interop/node_modules | ||
- run: | ||
name: Installing reporting tools | ||
command: | | ||
npm install --save-dev [email protected] | ||
npm init -y | ||
npm install ipfs@^0.50.1 | ||
npm install ipfs-interop@^3.0.0 | ||
npm install [email protected] | ||
working_directory: ~/ipfs/go-ipfs/interop | ||
- run: | ||
name: Running tests | ||
command: | | ||
mkdir -p /tmp/test-results/interop/ | ||
export MOCHA_FILE="$(mktemp /tmp/test-results/interop/unit.XXXXXX.xml)" | ||
node_modules/.bin/mocha --reporter mocha-circleci-reporter \ | ||
$(sed -n -e "s|^require('\(.*\)')$|test/\1|p" test/node.js | circleci tests split) | ||
npx ipfs-interop -- -t node -f $(sed -n -e "s|^require('\(.*\)')$|test/\1|p" node_modules/ipfs-interop/test/node.js | circleci tests split) -- --reporter mocha-circleci-reporter | ||
working_directory: ~/ipfs/go-ipfs/interop | ||
environment: | ||
IPFS_REUSEPORT: false | ||
|
@@ -386,12 +370,12 @@ workflows: | |
# also means tag-based jobs can only depend on other tag-based jobs, so we | ||
# use a separate workflow because every job needs to be tagged together. | ||
# see: https://circleci.com/docs/2.0/workflows/#executing-workflows-for-a-git-tag | ||
docker-on-tag: | ||
docker-on-tag: | ||
jobs: | ||
- docker-build: | ||
filters: *only-version-tags | ||
filters: *only-version-tags | ||
- docker-push: | ||
context: dockerhub | ||
filters: *only-version-tags | ||
filters: *only-version-tags | ||
requires: | ||
- docker-build |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,8 @@ about: 'Report a bug in go-ipfs.' | |
labels: kind/bug, need/triage | ||
--- | ||
|
||
<!-- Please report security issues by email to [email protected] --> | ||
|
||
#### Version information: | ||
<!-- Output From `ipfs version --all` | ||
|
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
FROM golang:1.14.4-buster | ||
# Note: when updating the go minor version here, also update the go-channel in snap/snapcraft.yml | ||
FROM golang:1.14.4-buster | ||
LABEL maintainer="Steven Allen <[email protected]>" | ||
|
||
# Install deps | ||
|
This file contains 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
This file contains 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
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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
Submodule dir-index-html
updated
11 files
+22 −0 | .github/workflows/build.yml | |
+22 −12 | README.md | |
+0 −62 | dir-index-uncat.html | |
+64 −28 | dir-index.html | |
+0 −1 | gw-assets/icons.css | |
+0 −1 | gw-assets/style.css | |
+12 −3 | package.json | |
+96 −0 | src/dir-index.html | |
+403 −0 | src/icons.css | |
+212 −0 | src/style.css | |
+46 −14 | test/main.go |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.