mirror of
https://github.com/priyanshujain/sanderling.git
synced 2026-10-02 11:07:10 +00:00
fix(release): stage the sidecar jar at the renamed embed path
This commit is contained in:
1 parent
47481fed93
commit
2a807b38fc
2 files changed
+9
-5
No files matched your search
+4
-4
@@ -5,10 +5,10 @@ project_name: sanderling
|
|||||||
before:
|
before:
|
||||||
hooks:
|
hooks:
|
||||||
# The Go binary embeds the sidecar fat JAR via //go:embed gated by the
|
# The Go binary embeds the sidecar fat JAR via //go:embed gated by the
|
||||||
# `withsidecar` build tag. Rebuild the JAR and stage it at the embed
|
# `withsidecar` build tag. The Makefile target rebuilds the JAR and stages
|
||||||
# path so the `go build` below picks up fresh bytes.
|
# it at the embed path, so the `go build` below picks up fresh bytes and
|
||||||
- make sidecar
|
# that path stays spelled out in exactly one place.
|
||||||
- sh -c 'mkdir -p internal/sidecar/assets && cp sidecar/build/libs/sidecar-all.jar internal/sidecar/assets/sidecar-all.jar'
|
- make sidecar-embed
|
||||||
|
|
||||||
builds:
|
builds:
|
||||||
- id: sanderling
|
- id: sanderling
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ WEB_DIST := replay-ui/dist
|
|||||||
|
|
||||||
GOLINES := $(shell $(GO) env GOPATH)/bin/golines
|
GOLINES := $(shell $(GO) env GOPATH)/bin/golines
|
||||||
|
|
||||||
.PHONY: bootstrap proto sidecar sanderling sanderling-web sanderling-android sanderling-ios install test test-go test-browser test-companion test-kotlin test-spec-api spec-typecheck web-test web-typecheck web-build web-dev replay-dev docs clean release-cli release-npm-dry fmt fmt-go fmt-kotlin fmt-ts fmt-swift
|
.PHONY: bootstrap proto sidecar sidecar-embed sanderling sanderling-web sanderling-android sanderling-ios install test test-go test-browser test-companion test-kotlin test-spec-api spec-typecheck web-test web-typecheck web-build web-dev replay-dev docs clean release-cli release-npm-dry fmt fmt-go fmt-kotlin fmt-ts fmt-swift
|
||||||
|
|
||||||
bootstrap:
|
bootstrap:
|
||||||
$(GO) mod download
|
$(GO) mod download
|
||||||
@@ -42,6 +42,10 @@ proto:
|
|||||||
|
|
||||||
sidecar: $(SIDECAR_JAR)
|
sidecar: $(SIDECAR_JAR)
|
||||||
|
|
||||||
|
# Stages the JAR where //go:embed expects it. Release tooling calls this rather
|
||||||
|
# than copying the JAR itself, so the embed path is spelled out in one place.
|
||||||
|
sidecar-embed: $(SIDECAR_EMBED)
|
||||||
|
|
||||||
sanderling: $(SANDERLING_BIN)
|
sanderling: $(SANDERLING_BIN)
|
||||||
|
|
||||||
$(SANDERLING_BIN): $(SIDECAR_EMBED) $(COMPANION_EMBED) $(RUNNER_EMBED) web-build
|
$(SANDERLING_BIN): $(SIDECAR_EMBED) $(COMPANION_EMBED) $(RUNNER_EMBED) web-build
|
||||||
|
|||||||
Reference in new issue
Block a user