Skip to content

Commit

Permalink
#152 Savepoint
Browse files Browse the repository at this point in the history
  • Loading branch information
docktermj committed Jul 12, 2024
1 parent 39266cc commit 2ff348a
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 15 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ build-scratch:

.PHONY: docker-build
docker-build:
docker build \
@docker build \
--tag $(DOCKER_IMAGE_NAME) \
--tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \
.
Expand All @@ -150,8 +150,8 @@ coverage: coverage-osarch-specific
.PHONY: check-coverage
check-coverage: export SENZING_LOG_LEVEL=TRACE
check-coverage:
go test ./... -coverprofile=./cover.out -covermode=atomic -coverpkg=./...
${GOBIN}/go-test-coverage --config=.github/coverage/.testcoverage.yaml
@go test ./... -coverprofile=./cover.out -covermode=atomic -coverpkg=./...
@${GOBIN}/go-test-coverage --config=.github/coverage/.testcoverage.yaml

# -----------------------------------------------------------------------------
# Run
Expand Down
2 changes: 1 addition & 1 deletion makefiles/darwin.mk
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ coverage-osarch-specific:

.PHONY: documentation-osarch-specific
documentation-osarch-specific:
godoc &
@godoc &
@open http://localhost:6060


Expand Down
9 changes: 5 additions & 4 deletions makefiles/linux.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

LD_LIBRARY_PATH ?= /opt/senzing/g2/lib
SENZING_TOOLS_DATABASE_URL ?= sqlite3://na:na@nowhere/tmp/sqlite/G2C.db
PATH := $(MAKEFILE_DIRECTORY)/bin:/$(HOME)/go/bin:$(PATH)

# -----------------------------------------------------------------------------
# OS specific targets
Expand Down Expand Up @@ -38,8 +39,8 @@ coverage-osarch-specific:

.PHONY: documentation-osarch-specific
documentation-osarch-specific:
godoc &
xdg-open http://localhost:6060
@godoc &
@xdg-open http://localhost:6060


.PHONY: hello-world-osarch-specific
Expand All @@ -51,8 +52,8 @@ hello-world-osarch-specific:
package-osarch-specific: docker-build-package
@mkdir -p $(TARGET_DIRECTORY) || true
@CONTAINER_ID=$$(docker create $(DOCKER_BUILD_IMAGE_NAME)); \
docker cp $$CONTAINER_ID:/output/. $(TARGET_DIRECTORY)/; \
docker rm -v $$CONTAINER_ID
@docker cp $$CONTAINER_ID:/output/. $(TARGET_DIRECTORY)/; \
@docker rm -v $$CONTAINER_ID


.PHONY: run-osarch-specific
Expand Down
14 changes: 7 additions & 7 deletions makefiles/windows.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ build-osarch-specific: windows/amd64

.PHONY: clean-osarch-specific
clean-osarch-specific:
del /F /S /Q $(GOPATH)/bin/$(PROGRAM_NAME)
del /F /S /Q $(MAKEFILE_DIRECTORY)/coverage.html
del /F /S /Q $(MAKEFILE_DIRECTORY)/coverage.out
del /F /S /Q $(MAKEFILE_DIRECTORY)/cover.out
del /F /S /Q $(TARGET_DIRECTORY)
del /F /S /Q C:\Temp\sqlite
taskkill /f /t/im godoc
@del /F /S /Q $(GOPATH)/bin/$(PROGRAM_NAME)
@del /F /S /Q $(MAKEFILE_DIRECTORY)/coverage.html
@del /F /S /Q $(MAKEFILE_DIRECTORY)/coverage.out
@del /F /S /Q $(MAKEFILE_DIRECTORY)/cover.out
@del /F /S /Q $(TARGET_DIRECTORY)
@del /F /S /Q C:\Temp\sqlite
@taskkill /f /t/im godoc


.PHONY: coverage-osarch-specific
Expand Down

0 comments on commit 2ff348a

Please sign in to comment.