cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove gx

Browse Source 
License: MIT
Signed-off-by: Kishan Mohanbhai Sagathiya <kishansagathiya@gmail.com>
This commit is contained in:
Kishan Mohanbhai Sagathiya 2019-06-25 16:07:36 +05:30 committed by Hector Sanjuan
parent 4c8738f585
commit 1dc3e1db2c
4 changed files with 11 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,7 +2,6 @@ tag_annotation
coverage.out
cmd/ipfs-cluster-service/ipfs-cluster-service
cmd/ipfs-cluster-ctl/ipfs-cluster-ctl
deptools/gx*
sharness/lib/sharness
sharness/test-results
sharness/trash*

23
Makefile
View File

@ -1,9 +1,4 @@
deptools=deptools
sharness = sharness/lib/sharness
gx=$(deptools)/gx
gx-go=$(deptools)/gx-go
export PATH := $(deptools):$(PATH)
all: build
clean: rwundo clean_sharness
@ -12,35 +7,35 @@ clean: rwundo clean_sharness
@rm -rf ./test/testingData
@rm -rf ./compose
install: gx-deps
install:
$(MAKE) -C cmd/ipfs-cluster-service install
$(MAKE) -C cmd/ipfs-cluster-ctl install
docker_install: docker_gx-deps
docker_install:
$(MAKE) -C cmd/ipfs-cluster-service install
$(MAKE) -C cmd/ipfs-cluster-ctl install
build: gx-deps
build:
go build -ldflags "-X ipfscluster.Commit=$(shell git rev-parse HEAD)"
$(MAKE) -C cmd/ipfs-cluster-service build
$(MAKE) -C cmd/ipfs-cluster-ctl build
service: gx-deps
service:
$(MAKE) -C cmd/ipfs-cluster-service ipfs-cluster-service
ctl: gx-deps
ctl:
$(MAKE) -C cmd/ipfs-cluster-ctl ipfs-cluster-ctl
check:
go vet ./...
golint -set_exit_status -min_confidence 0.3 ./...
test: gx-deps
test:
go test -v ./...
test_sharness: $(sharness)
@sh sharness/run-sharness-tests.sh
test_problem: gx-deps
test_problem:
go test -timeout 20m -loglevel "DEBUG" -v -run $(problematic_test)
$(sharness):
@ -77,6 +72,6 @@ docker-compose:
docker exec cluster1 ipfs-cluster-ctl peers ls | grep -o "Sees 1 other peers" | uniq -c | grep 2
docker-compose down
prcheck: gx-deps check service ctl test
prcheck: check service ctl test
.PHONY: all gx gx-deps test test_sharness clean_sharness rw rwundo publish service ctl install clean gx-clean docker
.PHONY: all test test_sharness clean_sharness rw rwundo publish service ctl install clean docker

45
deptools/Makefile
View File

@ -1,45 +0,0 @@
gx_version=v0.14.1
gx-go_version=v1.9.0
gateway=https://ipfs.io
local_gateway=http://127.0.0.1:8080
dist=dist.ipfs.io
dl_cmd=wget -nc
gx=gx_$(gx_version)
gx-go=gx-go_$(gx-go_version)
bin_env=$(shell go env GOHOSTOS)-$(shell go env GOHOSTARCH)
gx_tar=$(gx)_$(bin_env).tar.gz
gx-go_tar=$(gx-go)_$(bin_env).tar.gz
gx_dist_path=/ipns/$(dist)/gx/$(gx_version)/$(gx_tar)
gx-go_dist_path=/ipns/$(dist)/gx-go/$(gx-go_version)/$(gx-go_tar)
gx_download_local=$(dl_cmd) $(local_gateway)$(gx_dist_path)
gx_download=$(dl_cmd) $(gateway)$(gx_dist_path)
gx-go_download_local=$(dl_cmd) $(local_gateway)$(gx-go_dist_path)
gx-go_download=$(dl_cmd) $(gateway)$(gx-go_dist_path)
$(gx):
@echo "Downloading gx"
rm -f gx
$(gx_download_local) || $(gx_download)
tar -zxf $(gx_tar) --strip-components=1 gx/gx
mv gx $(gx)
ln -s $(gx) gx
rm $(gx_tar)
$(gx-go):
@echo "Downloading gx-go"
rm -f gx-go
$(gx-go_download_local) || $(gx-go_download)
tar -zxf $(gx-go_tar) --strip-components=1 gx-go/gx-go
mv gx-go $(gx-go)
ln -s $(gx-go) gx-go
rm $(gx-go_tar)
gx: $(gx) $(gx-go)
gx-clean:
@rm -f gx*

5
release.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
# Updates the Version variables, commits, tags, signs and "gx release" the package
# Updates the Version variables, commits, tags and signs
set -e
set -x
@ -21,5 +21,4 @@ echo "Tag for Release ${version}" > tag_annotation
echo >> tag_annotation
git log --pretty=oneline ${lastver}..HEAD >> tag_annotation
git tag -a -s -F tag_annotation v$version
rm tag_annotation
# gx release $version
rm tag_annotation