Skip to content

Commit

Permalink
Unify CI for pull requests and pushes to main (#50)
Browse files Browse the repository at this point in the history
This patch brings together the GitHub workflows for pull requests and
pushes to main so that there is a single workflow for continuous
integration.

The reason why they were separated was a misconception on my side how
GitHub filters the events.
  • Loading branch information
mristin committed Jun 20, 2021
1 parent 059c630 commit 8a56bf1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 59 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
name: Test-on-pull-request

on: [pull_request]
name: CI

on:
push:
branches: [ master, main ]
tags: [ "**" ]
pull_request:
branches: [ "**" ]

jobs:
Execute:
Expand Down
53 changes: 0 additions & 53 deletions .github/workflows/test-on-push-to-main.yml

This file was deleted.

6 changes: 3 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
icontract-hypothesis
====================

.. image:: https://github.com/mristin/icontract-hypothesis/workflows/Test-on-push-to-main/badge.svg
:target: https://github.com/mristin/icontract-hypothesis/actions?query=workflow%3ATest-on-push-to-main
:alt: Test
.. image:: https://github.com/mristin/icontract-hypothesis/workflows/CI/badge.svg
:target: https://github.com/mristin/icontract-hypothesis/actions?query=workflow%3ACI
:alt: Continuous integration

.. image:: https://coveralls.io/repos/github/mristin/icontract-hypothesis/badge.svg?branch=main
:target: https://coveralls.io/github/mristin/icontract-hypothesis?branch=main
Expand Down

0 comments on commit 8a56bf1

Please sign in to comment.