Skip to content

Commit

Permalink
Merge pull request #61 from madflojo/globalsconfig
Browse files Browse the repository at this point in the history
Cleaning up little things
  • Loading branch information
madflojo authored Sep 30, 2023
2 parents 8a3f1d1 + 0253699 commit addf194
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions dev-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/.*" ./...
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions docs/wasm-functions/multi-function-services.md
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
File renamed without changes.

0 comments on commit addf194

Please sign in to comment.