Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .github/workflows/espresso-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ on:
pull_request:
push:
branches:
- integration
- celestia-integration
- "**"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ output_root=target
sed_escaped_output_root:=$(subst /,\/,$(output_root))
output_latest=$(output_root)/machines/latest

export PKG_CONFIG_PATH=$(abspath $(output_root)/pkgconfig)

repo_dirs = arbos arbcompress arbnode arbutil arbstate cmd das espressocrypto precompiles solgen system_tests util validator wavmio
go_source.go = $(wildcard $(patsubst %,%/*.go, $(repo_dirs)) $(patsubst %,%/*/*.go, $(repo_dirs)))
go_source.s = $(wildcard $(patsubst %,%/*.s, $(repo_dirs)) $(patsubst %,%/*/*.s, $(repo_dirs)))
Expand Down Expand Up @@ -342,7 +344,7 @@ docker:
# regular build rules

$(output_root)/bin/nitro: $(DEP_PREDICATE) build-node-deps
export PKG_CONFIG_PATH=$(abspath $(output_root)/pkgconfig) && go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/nitro"
go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/nitro"

$(output_root)/bin/deploy: $(DEP_PREDICATE) build-node-deps
go build $(GOLANG_PARAMS) -o $@ "$(CURDIR)/cmd/deploy"
Expand Down
Loading