Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bug-fix: update module path and version #1558

Merged
merged 6 commits into from
Jul 11, 2023
Merged

bug-fix: update module path and version #1558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
00e8192
update module path and version
shiqizng Jul 6, 2023
4be2778
Update Makefile
shiqizng Jul 7, 2023
2af27bc
changes per pr comment
shiqizng Jul 7, 2023
d923103
rm deprecated release script
shiqizng Jul 7, 2023
bd0ba8c
fix lint errs
shiqizng Jul 7, 2023
e9d1258
update ReleaseVersion description
shiqizng Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .goreleaser.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ builds:
- arm64
ldflags: >
-s -w
-X github.com/algorand/indexer/version.Hash={{.FullCommit}}
-X github.com/algorand/indexer/version.ShortHash={{.ShortCommit}}
-X github.com/algorand/indexer/version.CompileTime={{.Timestamp}}
-X github.com/algorand/indexer/version.ReleaseVersion={{.Version}}
-X github.com/algorand/indexer/v3/version.Hash={{.FullCommit}}
-X github.com/algorand/indexer/v3/version.ShortHash={{.ShortCommit}}
-X github.com/algorand/indexer/v3/version.CompileTime={{.Timestamp}}
-X github.com/algorand/indexer/v3/version.ReleaseVersion={{.Version}}

dockers:
- use: buildx
Expand Down
1 change: 0 additions & 1 deletion .version
View file
Open in desktop

This file was deleted.

19 changes: 3 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
SRCPATH := $(shell pwd)
VERSION := $(shell $(SRCPATH)/mule/scripts/compute_build_number.sh)
OS_TYPE ?= $(shell $(SRCPATH)/mule/scripts/ostype.sh)
ARCH ?= $(shell $(SRCPATH)/mule/scripts/archtype.sh)
PKG_DIR = $(SRCPATH)/tmp/node_pkgs/$(OS_TYPE)/$(ARCH)/$(VERSION)
ifeq ($(OS_TYPE), darwin)
ifeq ($(ARCH), arm64)
export CPATH=/opt/homebrew/include
Expand All @@ -12,9 +10,9 @@ endif
export GOPATH := $(shell go env GOPATH)
GOPATH1 := $(firstword $(subst :, ,$(GOPATH)))

GOLDFLAGS += -X github.com/algorand/indexer/version.Hash=$(shell git log -n 1 --pretty="%H")
GOLDFLAGS += -X github.com/algorand/indexer/version.CompileTime=$(shell date -u +%Y-%m-%dT%H:%M:%S%z)
GOLDFLAGS += -X github.com/algorand/indexer/version.ReleaseVersion=$(shell cat .version)
GOLDFLAGS += -X github.com/algorand/indexer/v3/version.Hash=$(shell git log -n 1 --pretty="%H")
GOLDFLAGS += -X github.com/algorand/indexer/v3/version.CompileTime=$(shell date -u +%Y-%m-%dT%H:%M:%S%z)
GOLDFLAGS += -X "github.com/algorand/indexer/v3/version.ReleaseVersion=Dev Build"

COVERPKG := $(shell go list ./... | grep -v '/cmd/' | egrep -v '(testing|test|mocks)$$' | paste -s -d, - )

Expand All @@ -39,17 +37,6 @@ idb/mocks/IndexerDb.go: idb/idb.go
check:
go build ./...

package:
rm -rf $(PKG_DIR)
mkdir -p $(PKG_DIR)
misc/release.py --host-only --outdir $(PKG_DIR)

# used in travis test builds; doesn't verify that tag and .version match
fakepackage:
rm -rf $(PKG_DIR)
mkdir -p $(PKG_DIR)
misc/release.py --host-only --outdir $(PKG_DIR) --fake-release

test: idb/mocks/IndexerDb.go cmd/algorand-indexer/algorand-indexer
go test -coverpkg=$(COVERPKG) ./... -coverprofile=coverage.txt -covermode=atomic ${TEST_FLAG}

Expand Down
339 changes: 0 additions & 339 deletions misc/release.py
View file
Open in desktop

This file was deleted.

Loading
Loading