diff --git a/.github/workflows/postgres-service.yml b/.github/workflows/postgres-service.yml index 6b5a5a4..84aa1ea 100644 --- a/.github/workflows/postgres-service.yml +++ b/.github/workflows/postgres-service.yml @@ -1,7 +1,15 @@ -on: [push] +name: Postgres Service Example + +on: + push: + branches: + - master + pull_request: + branches: + - master jobs: - build: + container-job: runs-on: ubuntu-latest container: @@ -30,3 +38,30 @@ jobs: # If we were running the job on the VM this would be localhost POSTGRES_HOST: postgres POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }} + + vm-job: + runs-on: ubuntu-latest + + services: + postgres: + image: postgres:10.8 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres + POSTGRES_DB: postgres + ports: + - 5432:5432 + # needed because the postgres container does not provide a healthcheck + options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 + + steps: + - uses: actions/checkout@v1 + - run: npm ci + working-directory: ./postgres + - run: node client.js + working-directory: ./postgres + env: + # use postgres for the host here because we have specified a contaienr for the job. + # If we were running the job on the VM this would be localhost + POSTGRES_HOST: localhost + POSTGRES_PORT: ${{ job.services.postgres.ports[5432] }} \ No newline at end of file diff --git a/.github/workflows/redis-service.yml b/.github/workflows/redis-service.yml index 7b39ad1..ae97c1d 100644 --- a/.github/workflows/redis-service.yml +++ b/.github/workflows/redis-service.yml @@ -1,3 +1,5 @@ +name: Redis Service Example + on: push: branches: @@ -21,6 +23,10 @@ jobs: steps: - uses: actions/checkout@v1 + + - run: npm ci + working-directory: ./redis + - run: node client.js env: REDIS_HOST: redis @@ -37,6 +43,10 @@ jobs: steps: - uses: actions/checkout@v1 + + - run: npm ci + working-directory: ./redis + - run: node client.js working-directory: ./redis env: