From 41b32835287c0885fe5079d05902475428119927 Mon Sep 17 00:00:00 2001 From: iliana etaoin Date: Wed, 17 Sep 2025 17:19:20 +0000 Subject: [PATCH] build: add cockroach-sql to cockroach.tgz --- .github/workflows/build-macos.yml | 4 +++- Makefile | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index fdf669efe6..8a3ebc2e3d 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -30,7 +30,7 @@ jobs: source .github/workflows/macos-setup.sh echo "PATH=$PATH" >>"$GITHUB_ENV" - name: Build - run: gmake -j`sysctl -n hw.ncpu` cockroachoss BUILDTYPE=release ${{ matrix.arch.makeargs }} + run: gmake -j`sysctl -n hw.ncpu` cockroachoss cockroach-sql BUILDTYPE=release ${{ matrix.arch.makeargs }} env: BROWSERSLIST_IGNORE_OLD_DATA: 1 CGO_ENABLED: 1 @@ -40,6 +40,7 @@ jobs: name: ${{ matrix.arch.arch }} path: | cockroachoss + cockroach-sql lib/libgeos.dylib lib/libgeos_c.dylib if-no-files-found: error @@ -55,6 +56,7 @@ jobs: set -o xtrace mkdir -p artifacts/cockroach/lib lipo -create -output artifacts/cockroach/cockroach {amd64,arm64}/cockroachoss + lipo -create -output artifacts/cockroach/cockroach-sql {amd64,arm64}/cockroach-sql lipo -create -output artifacts/cockroach/lib/libgeos.dylib {amd64,arm64}/lib/libgeos.dylib lipo -create -output artifacts/cockroach/lib/libgeos_c.dylib {amd64,arm64}/lib/libgeos_c.dylib chmod a+x artifacts/cockroach/{cockroach,lib/*.dylib} diff --git a/Makefile b/Makefile index 32c78f177f..599d00a424 100644 --- a/Makefile +++ b/Makefile @@ -1054,10 +1054,11 @@ pre-push: generate lint test ui-lint ui-test ! git status --porcelain | read || (git status; git --no-pager diff -a 1>&2; exit 1) cockroach.tgz: ## Build a binary tarball. -cockroach.tgz: $(COCKROACHOSS) $(LIBGEOS) +cockroach.tgz: $(COCKROACHOSS) $(COCKROACHSQL) $(LIBGEOS) rm -rf artifacts/cockroach mkdir -p artifacts/cockroach/lib ln $(COCKROACHOSS) artifacts/cockroach/cockroach + ln $(COCKROACHSQL) artifacts/cockroach/cockroach-sql ln $(DYN_LIB_DIR)/libgeos.$(DYN_EXT) $(DYN_LIB_DIR)/libgeos_c.$(DYN_EXT) artifacts/cockroach/lib/ tar -cvf - -C artifacts cockroach | gzip -9 > $@ sha256sum $@ | awk '{ print $$1 }' > $@.sha256