diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index aafb8d1..8dd25be 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -46,7 +46,7 @@ jobs: - uses: mozilla-actions/sccache-action@v0.0.3 - name: Run tests run: | - echo "Skipping tests" + make test env: DID_DOCUMENT: ${{ vars.DID_DOCUMENT }} DID_PRIVATE_KEY: ${{ secrets.DID_PRIVATE_KEY }} diff --git a/Makefile b/Makefile index 9bf863c..29cabe2 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,10 @@ DEPLOY_TAG ?= latest # Whether or not this is a manual deployment MANUAL_DEPLOY ?= false -DATABASE_URL ?= sqlite://checkpointer.db +DID_DOCUMENT ?= ${DID_DOCUMENT} +DID_PRIVATE_KEY ?= ${DID_PRIVATE_KEY} +DATABASE_URL ?= ${DATABASE_URL} +RUST_LOG ?= ${RUST_LOG} .PHONY: all all: build check-fmt check-clippy test @@ -57,9 +60,9 @@ test: # Setup scaffolding ./ci-scripts/setup_test_env.sh # Test with default features - DATABASE_URL=$(DATABASE_URL) $(CARGO) test -p checkpointer --locked --release + $(CARGO) test -p checkpointer --locked --release # Test with all features - DATABASE_URL=$(DATABASE_URL) $(CARGO) test -p checkpointer --locked --release --all-features + $(CARGO) test -p checkpointer --locked --release --all-features ./ci-scripts/teardown_test_env.sh .PHONY: test-event-joiner