From c12236d8f324ea8a4945969d1db7cd1db4b5e2f3 Mon Sep 17 00:00:00 2001 From: Dmitry Kropachev Date: Thu, 24 Apr 2025 17:38:40 -0400 Subject: [PATCH] Makefile: rename run-scylla to start-scylla (#311) --- .github/workflows/main.yml | 3 --- Makefile | 6 +++--- migrate/example/example_test.go | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8be1264..c6e86db 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,8 +42,5 @@ jobs: - name: Lint run: make check - - name: Run Scylla Container - run: make run-scylla - - name: Test run: make test diff --git a/Makefile b/Makefile index 5d35aca..3dc7bce 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ fix: GOTEST := go test -cpu $(GOTEST_CPU) -count=1 -cover -race -tags all .PHONY: test -test: +test: start-scylla echo "==> Running tests..." echo "==> Running tests... in ." @$(GOTEST) . @@ -62,8 +62,8 @@ bench: run-examples: @go test -tags all -v -run=Example ./... -.PHONY: run-scylla -run-scylla: +.PHONY: start-scylla +start-scylla: @echo "==> Running test instance of Scylla $(SCYLLA_IMAGE)" @docker pull $(SCYLLA_IMAGE) @docker run --name gocqlx-scylla -p 9042:9042 --cpuset-cpus=$(SCYLLA_CPU) --memory 1G --rm -d $(SCYLLA_IMAGE) diff --git a/migrate/example/example_test.go b/migrate/example/example_test.go index 457f132..e5e4942 100644 --- a/migrate/example/example_test.go +++ b/migrate/example/example_test.go @@ -18,7 +18,7 @@ import ( ) // Running examples locally: -// make run-scylla +// make start-scylla // make run-examples func TestExample(t *testing.T) { const ks = "migrate_example"