From bb2b022d3fb58375984f1d96c6a41c6481465b51 Mon Sep 17 00:00:00 2001 From: Darragh Bailey Date: Sat, 20 Feb 2021 15:33:15 +0000 Subject: [PATCH] Ensure github actions run on merge to main branch (#1207) Remove missed debug line from unit test workflow. --- .github/workflows/docker-image.yml | 4 ++-- .github/workflows/unit-tests.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 6d21139..89131b8 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -3,13 +3,13 @@ name: docker-image on: push: branches: - - '**' + - master tags: - '*.*.*' pull_request: jobs: - main: + build-docker-image: runs-on: ubuntu-latest steps: - diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 0f7babe..83be197 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -9,7 +9,8 @@ name: CI on: push: - branches: [ $default-branch ] + branches: + - master pull_request: jobs: @@ -68,7 +69,6 @@ jobs: - name: Run tests run: | bundle exec rspec --color --format documentation - cat ./coverage/lcov.info env: VAGRANT_VERSION: ${{ matrix.vagrant }} - name: Coveralls Parallel