Merge pull request #243 from DecentralCardGame/242-cosmos-v50

242 cosmos v50

Author: lxgr-linux

.editorconfig

@@ -0,0 +1,5 @@
+[*.proto]
+indent_style = space
+trim_trailing_whitespace = false
+indent_size = 2
+tab_width = 2

.github/workflows/release.yml

@@ -10,7 +10,7 @@
 #
 #    This type of prelease is useful to make your bleeding-edge binaries available to advanced users.
 #
-# The workflow will not run if there is no tag pushed with a "v" prefix and no change pushed to your 
+# The workflow will not run if there is no tag pushed with a "v" prefix and no change pushed to your
 # default branch.
 on: push
 
@@ -22,19 +22,21 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-        
-      - name: Prepare Release Variables 
+
+      - name: Prepare Release Variables
         id: vars
-        uses: ignite/cli/actions/release/vars@v0.26.1
+        uses: ignite/cli/actions/release/vars@main
 
-      - name: Issue Release Assets 
-        uses: ignite/cli/actions/cli@v0.26.1
+      - name: Issue Release Assets
+        uses: ignite/cli/actions/cli@main
         if: ${{ steps.vars.outputs.should_release == 'true' }}
         with:
-          args: chain build --release --release.prefix ${{ steps.vars.outputs.tarball_prefix }} -t linux:amd64 -t darwin:amd64 --yes
+          args: chain build --release --release.prefix ${{ steps.vars.outputs.tarball_prefix }} -t linux:amd64 -t darwin:amd64 -t darwin:arm64 -y
+        env:
+          DO_NOT_TRACK: 1
 
       - name: Delete the "latest" Release
-        uses: dev-drprasad/[email protected] 
+        uses: dev-drprasad/[email protected]
         if: ${{ steps.vars.outputs.is_release_type_latest == 'true' }}
         with:
           tag_name: ${{ steps.vars.outputs.tag_name }}
@@ -48,6 +50,6 @@ jobs:
         with:
           tag_name: ${{ steps.vars.outputs.tag_name }}
           files: release/*
-          prerelease: true 
+          prerelease: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,11 +1,14 @@
-/backup
 vue/node_modules
 vue/dist
-/vue
 release/
 .idea/
 .vscode/
 .DS_Store
+*.dot
+*.log
+*.ign
+/vue
+/goat/node_modules
 /build
 /cs
 /goat/node_modules

Makefile

@@ -1,35 +1,109 @@
-###############################################################################
-###                                  Build                                  ###
-###############################################################################
+BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+COMMIT := $(shell git log -1 --format='%H')
+APPNAME := cardchain
 
-# Default target
-all: install
+# don't override user values
+ifeq (,$(VERSION))
+  VERSION := $(shell git describe --exact-match 2>/dev/null)
+  # if VERSION is empty, then populate it with branch's name and raw commit hash
+  ifeq (,$(VERSION))
+    VERSION := $(BRANCH)-$(COMMIT)
+  endif
+endif
+
+# Update the ldflags with the app, client & server names
+ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=$(APPNAME) \
+	-X github.com/cosmos/cosmos-sdk/version.AppName=$(APPNAME)d \
+	-X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
+	-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT)
+
+BUILD_FLAGS := -ldflags '$(ldflags)'
+
+##############
+###  Test  ###
+##############
+
+test-unit:
+	@echo Running unit tests...
+	@go test -mod=readonly -v -timeout 30m ./...
+
+test-race:
+	@echo Running unit tests with race condition reporting...
+	@go test -mod=readonly -v -race -timeout 30m ./...
 
-# Build directory
-BUILDDIR := ./build
+test-cover:
+	@echo Running unit tests and creating coverage report...
+	@go test -mod=readonly -v -timeout 30m -coverprofile=$(COVER_FILE) -covermode=atomic ./...
+	@go tool cover -html=$(COVER_FILE) -o $(COVER_HTML_FILE)
+	@rm $(COVER_FILE)
 
-# Build the project
-build: go.sum $(BUILDDIR)/
-	@echo "Warning: Building without version information"
-	@echo "Warning: To build with version info and defaults please use './ignite chain build'"
-	go build -tags=ledger -mod=readonly -o $(BUILDDIR)/ ./...
+bench:
+	@echo Running unit tests with benchmarking...
+	@go test -mod=readonly -v -timeout 30m -bench=. ./...
 
-# Create the build directory
-$(BUILDDIR)/:
-	mkdir -p $(BUILDDIR)/
+test: govet govulncheck test-unit
 
-# Install binary to ~/go/bin/
-install: build
-	cp $(BUILDDIR)/cardchaind ~/go/bin/
+.PHONY: test test-unit test-race test-cover bench
 
-# Verify dependencies
-go.sum: go.mod
-	@echo "Ensure dependencies have not been modified ..." >&2
+#################
+###  Install  ###
+#################
+
+all: install
+
+install:
+	@echo "--> ensure dependencies have not been modified"
 	@go mod verify
+	@echo "--> installing $(APPNAME)d"
+	@go install $(BUILD_FLAGS) -mod=readonly ./cmd/$(APPNAME)d
+
+.PHONY: all install
+
+##################
+###  Protobuf  ###
+##################
+
+# Use this proto-image if you do not want to use Ignite for generating proto files
+protoVer=0.15.1
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
+protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
+
+proto-gen:
+	@echo "Generating protobuf files..."
+	@ignite generate proto-go --yes
+
+.PHONY: proto-gen
+
+#################
+###  Linting  ###
+#################
+
+golangci_lint_cmd=golangci-lint
+golangci_version=v1.61.0
+
+lint:
+	@echo "--> Running linter"
+	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
+	@$(golangci_lint_cmd) run ./... --timeout 15m
+
+lint-fix:
+	@echo "--> Running linter and fixing issues"
+	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(golangci_version)
+	@$(golangci_lint_cmd) run ./... --fix --timeout 15m
+
+.PHONY: lint lint-fix
+
+###################
+### Development ###
+###################
+
+govet:
+	@echo Running go vet...
+	@go vet ./...
 
-# Clean build directory
-clean:
-	rm -rf $(BUILDDIR)/
+govulncheck:
+	@echo Running govulncheck...
+	@go install golang.org/x/vuln/cmd/govulncheck@latest
+	@govulncheck ./...
 
-# Phony targets
-.PHONY: all build install clean
+.PHONY: govet govulncheck