Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into burn-poa
Browse files Browse the repository at this point in the history
  • Loading branch information
fmorency committed Jun 3, 2024
2 parents 476da13 + 53591a6 commit 76777d8
Show file tree
Hide file tree
Showing 33 changed files with 1,749 additions and 3,499 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
wget -c https://github.com/strangelove-ventures/heighliner/releases/download/v1.5.4/heighliner_1.5.4_linux_amd64.tar.gz -O - | tar -xz heighliner
mv heighliner /usr/local/bin
- name: Make local image
run: make local-image-cov
run: make local-image
- name: Run coverage
run: make coverage
- name: Upload coverage to Codecov
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ jobs:
uses: docker/build-push-action@v5
with:
context: .
tags: manifest-cov:local
tags: manifest:local
outputs: type=docker,dest=${{ env.TAR_PATH }}
build-args: |
BUILD_CMD=build-cover
BUILD_CMD=build
- name: Upload artifact
uses: actions/upload-artifact@v3
Expand Down
25 changes: 2 additions & 23 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,6 @@ BUILD_FLAGS := -tags "$(build_tags_comma_sep)" -ldflags '$(ldflags)' -trimpath
all: install

install:
@echo "--> ensure dependencies have not been modified"
@go mod verify
@echo "--> installing manifestd"
@go install $(BUILD_FLAGS) -mod=readonly ./cmd/manifestd

install-cover:
@echo "--> ensure dependencies have not been modified"
@go mod verify
@echo "--> installing manifestd instrumented for coverage"
Expand All @@ -95,14 +89,6 @@ init:
./scripts/init.sh

build:
ifeq ($(OS),Windows_NT)
$(error demo server not supported)
exit 1
else
go build -mod=readonly $(BUILD_FLAGS) -o $(BUILD_DIR)/manifestd ./cmd/manifestd
endif

build-cover:
ifeq ($(OS),Windows_NT)
$(error demo server not supported)
exit 1
Expand All @@ -113,7 +99,7 @@ endif
build-vendored:
go build -mod=vendor $(BUILD_FLAGS) -o $(BUILD_DIR)/manifestd ./cmd/manifestd

.PHONY: all build build-linux install init lint build-vendored build-cover
.PHONY: all build build-linux install init lint build-vendored

###############################################################################
### INTERCHAINTEST (ictest) ###
Expand Down Expand Up @@ -151,14 +137,7 @@ else
heighliner build -c manifest --local -f ./chains.yaml
endif

local-image-cov:
ifeq (,$(shell which heighliner))
echo 'heighliner' binary not found. Consider running `make get-heighliner`
else
heighliner build -c manifest-cov --local -f ./chains.yaml
endif

.PHONY: get-heighliner local-image local-image-cov
.PHONY: get-heighliner local-image

#################
### Test ###
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</p>

<p align="center">
<a href="https://codecov.io/gh/liftedinit/manifest-ledger" >
<img src="https://codecov.io/gh/liftedinit/manifest-ledger/graph/badge.svg?token=s7zzdGQ7Gh"/>
<a href="https://codecov.io/gh/liftedinit/manifest-ledger" >
<img src="https://codecov.io/gh/liftedinit/manifest-ledger/graph/badge.svg?token=s7zzdGQ7Gh"/>
</a>
<a href="https://goreportcard.com/report/github.com/liftedinit/manifest-ledger">
<img src="https://goreportcard.com/badge/github.com/liftedinit/manifest-ledger" alt="Go Report Card"/>
Expand Down Expand Up @@ -126,7 +126,7 @@ make ictest-ibc
To generate a coverage report for the modules run:

```bash
make local-image-cov
make local-image
make coverage
````

Expand Down
Loading

0 comments on commit 76777d8

Please sign in to comment.