Skip to content

build: add cockroach-sql to cockroach.tgz #39

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

Merged
iliana merged 1 commit into from
Sep 17, 2025
Merged

build: add cockroach-sql to cockroach.tgz #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion .github/workflows/build-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down