diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 752351d..3959987 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: with: go-version: '1.21' - name: Execute Tests - run: make build tests-nodeps + run: make build tests-base - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 diff --git a/Makefile b/Makefile index 4009ca3..f3d8ce8 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,12 @@ build-testdata: $(MAKE) -C testdata/function build tests: build tests-nobuild -tests-nobuild: tests-nodeps tests-redis tests-cassandra tests-mysql tests-postgres tests-boltdb tests-inmemory +tests-nobuild: tests-base tests-redis tests-cassandra tests-mysql tests-postgres tests-boltdb tests-inmemory -tests-nodeps: +tests-base: @echo "Launching Tests in Docker Compose" - docker-compose -f dev-compose.yml up --exit-code-from tests-nodeps --build tests-nodeps + docker-compose -f dev-compose.yml up -d consul consulator + docker-compose -f dev-compose.yml up --exit-code-from tests-base --build tests-base docker-compose -f dev-compose.yml down tests-boltdb: diff --git a/dev-compose.yml b/dev-compose.yml index 1967759..f67ee3a 100644 --- a/dev-compose.yml +++ b/dev-compose.yml @@ -38,7 +38,7 @@ services: - redis - consul - consulator - tests-nodeps: + tests-base: image: golang:latest working_dir: /go/src/github.com/madflojo/tarmac entrypoint: go test -v -race -covermode=atomic -coverprofile=/tmp/coverage/coverage.out -skip "TestFullService/.*" ./... @@ -246,7 +246,7 @@ services: - 8500:8500 consulator: image: lewispeckover/consulator - command: "import /app/tarmac-consul.yml" + command: "import /app/testdata/tarmac-consul.yml" depends_on: - consul volumes: diff --git a/docs/wasm-functions/multi-function-services.md b/docs/wasm-functions/multi-function-services.md index f868b65..7fa257d 100644 --- a/docs/wasm-functions/multi-function-services.md +++ b/docs/wasm-functions/multi-function-services.md @@ -12,9 +12,6 @@ The `tarmac.json` file has a simple structure that consists of a single object w ```json { - "globals": { - "log_level": "debug" - }, "services": { "my-service": { "name": "my-service", diff --git a/tarmac-consul.yml b/testdata/tarmac-consul.yml similarity index 100% rename from tarmac-consul.yml rename to testdata/tarmac-consul.yml