From 10c59bb288de61082ea9ce69f1bd03ca92e9af6f Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Sun, 28 Feb 2021 13:40:26 -0300 Subject: [PATCH 1/8] fix test and build targets in makefile --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ba1fbd9a6..a7c8fe3c9 100644 --- a/Makefile +++ b/Makefile @@ -65,14 +65,14 @@ ifeq ($(UNAME_S), Linux) endif build: ## Build CX from sources - go build $(GO_OPTS) -tags="base" -o ./bin/cx github.com/skycoin/cx/cxgo/ + go build $(GO_OPTS) -tags="base" -o ./bin/cx github.com/skycoin/cx/cmd/cx chmod +x ./bin/cx clean: ## Removes binaries. rm -r ./bin/cx build-full: install-full ## Build CX from sources with all build tags - go build $(GO_OPTS) -tags="base cxfx" -o ./bin/cx github.com/skycoin/cx/cxgo/ + go build $(GO_OPTS) -tags="base cxfx" -o ./bin/cx github.com/skycoin/cx/cmd/cx chmod +x ./bin/cx token-fuzzer: @@ -94,12 +94,12 @@ ifndef CXVERSION @echo "cx not found in $(PWD)/bin, please run make install first" else # go test $(GO_OPTS) -race -tags base github.com/skycoin/cx/cxgo/ - ./bin/cx ./lib/args.cx ./tests/main.cx ++wdir=./tests ++disable-tests=gui,issue + ./bin/cx ./lib/args.cx ./tests/main.cx ++wdir=./tests ++disable-tests=gui,issue ++cxpath=$(PWD)/bin/cx endif test-full: build ## Run CX test suite with all build tags # go test $(GO_OPTS) -race -tags="base cxfx" github.com/skycoin/cx/cxgo/ - ./bin/cx ./lib/args.cx ./tests/main.cx ++wdir=./tests ++disable-tests=gui,issue + ./bin/cx ./lib/args.cx ./tests/main.cx ++wdir=./tests ++disable-tests=gui,issue ++cxpath=$(PWD)/bin/cx configure-workspace: ## Configure CX workspace environment mkdir -p $(CX_PATH)/src $(CX_PATH)/bin $(CX_PATH)/pkg From c5172c209dcd3d872dc091bcf1bf337ee04fd626 Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Sun, 28 Feb 2021 13:55:59 -0300 Subject: [PATCH 2/8] travis and makefile cleanups --- .travis.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index c93538071..0387e8b49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,16 +19,13 @@ matrix: # Install necessaries go packages install: - - make install - - make install-gfx-deps - - make install-linters + - go get -u modernc.org/goyacc + - go get golang.org/x/mobile/gl # Build, test & run cx test script: - - make build-full - - make test - - make test-full - - make lint + - make build + - make install # Notifications to Telegram channel notifications: From ab741294e42685b8b4333bc2faca9ec7015bb414 Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Sun, 28 Feb 2021 13:58:00 -0300 Subject: [PATCH 3/8] forgot to push makefile changes --- Makefile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index a7c8fe3c9..9919f421e 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ export GO111MODULE=on .DEFAULT_GOAL := help -.PHONY: build-parser build build-full test test-full -.PHONY: install-deps install install-full +.PHONY: build-parser build test +.PHONY: install .PHONY: dep PWD := $(shell pwd) @@ -71,7 +71,7 @@ build: ## Build CX from sources clean: ## Removes binaries. rm -r ./bin/cx -build-full: install-full ## Build CX from sources with all build tags +build-full: full ## Build CX from sources with all build tags go build $(GO_OPTS) -tags="base cxfx" -o ./bin/cx github.com/skycoin/cx/cmd/cx chmod +x ./bin/cx @@ -79,16 +79,14 @@ token-fuzzer: go build $(GO_OPTS) -o ./bin/cx-token-fuzzer $(PWD)/development/token-fuzzer/main.go chmod +x ${GOPATH}/bin/cx-token-fuzzer -build-parser: install-deps ## Generate lexer and parser for CX grammar +build-parser: ## Generate lexer and parser for CX grammar ./bin/goyacc -o cxgo/cxgo0/cxgo0.go cxgo/cxgo0/cxgo0.y ./bin/goyacc -o cxgo/parser/cxgo.go cxgo/parser/cxgo.y -install: install-deps build configure-workspace ## Install CX from sources. Build dependencies +install: build configure-workspace ## Install CX from sources. Build dependencies @echo 'NOTE:\tWe recommend you to test your CX installation by running "cx ./tests"' ./bin/cx -v -install-full: configure-workspace - test: ## Run CX test suite. ifndef CXVERSION @echo "cx not found in $(PWD)/bin, please run make install first" @@ -97,10 +95,6 @@ else ./bin/cx ./lib/args.cx ./tests/main.cx ++wdir=./tests ++disable-tests=gui,issue ++cxpath=$(PWD)/bin/cx endif -test-full: build ## Run CX test suite with all build tags - # go test $(GO_OPTS) -race -tags="base cxfx" github.com/skycoin/cx/cxgo/ - ./bin/cx ./lib/args.cx ./tests/main.cx ++wdir=./tests ++disable-tests=gui,issue ++cxpath=$(PWD)/bin/cx - configure-workspace: ## Configure CX workspace environment mkdir -p $(CX_PATH)/src $(CX_PATH)/bin $(CX_PATH)/pkg @echo "NOTE:\tCX workspace at $(CX_PATH)" From 1185746a1b619bbcf0a2771f62590fda17c26ee5 Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Sun, 28 Feb 2021 13:59:18 -0300 Subject: [PATCH 4/8] remove build-full target that is redundant --- Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile index 9919f421e..0ba811989 100644 --- a/Makefile +++ b/Makefile @@ -71,10 +71,6 @@ build: ## Build CX from sources clean: ## Removes binaries. rm -r ./bin/cx -build-full: full ## Build CX from sources with all build tags - go build $(GO_OPTS) -tags="base cxfx" -o ./bin/cx github.com/skycoin/cx/cmd/cx - chmod +x ./bin/cx - token-fuzzer: go build $(GO_OPTS) -o ./bin/cx-token-fuzzer $(PWD)/development/token-fuzzer/main.go chmod +x ${GOPATH}/bin/cx-token-fuzzer From cf005719d689e484bd9b908c87358b63975a650d Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Sun, 28 Feb 2021 14:04:14 -0300 Subject: [PATCH 5/8] remove redundant call in makefile make install target --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0ba811989..bda8fe9e9 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ build-parser: ## Generate lexer and parser for CX grammar ./bin/goyacc -o cxgo/cxgo0/cxgo0.go cxgo/cxgo0/cxgo0.y ./bin/goyacc -o cxgo/parser/cxgo.go cxgo/parser/cxgo.y -install: build configure-workspace ## Install CX from sources. Build dependencies +install: configure-workspace ## Install CX from sources. Build dependencies @echo 'NOTE:\tWe recommend you to test your CX installation by running "cx ./tests"' ./bin/cx -v From 186e6c4040151b5d824318c7f57febc087de9184 Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Sun, 28 Feb 2021 14:15:29 -0300 Subject: [PATCH 6/8] remove go get mobile gl --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0387e8b49..690f3ad44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,6 @@ matrix: # Install necessaries go packages install: - go get -u modernc.org/goyacc - - go get golang.org/x/mobile/gl # Build, test & run cx test script: From 5099f2b72a75f5db5a151c51b25a8d071e89d552 Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Sun, 28 Feb 2021 14:22:15 -0300 Subject: [PATCH 7/8] travis update --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 690f3ad44..54f200980 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,10 +17,6 @@ matrix: dist: xenial - os: osx -# Install necessaries go packages -install: - - go get -u modernc.org/goyacc - # Build, test & run cx test script: - make build From 2fe3f0af3ba729d627e9495580568aea46829455 Mon Sep 17 00:00:00 2001 From: Erich Kaestner <36450093+jdknives@users.noreply.github.com> Date: Sun, 28 Feb 2021 14:30:15 -0300 Subject: [PATCH 8/8] add back in tests --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 54f200980..b6c5e3768 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,7 @@ matrix: script: - make build - make install + - make test # Notifications to Telegram channel notifications: