From a8ef76f5c2a4752c33f7703048e55e38cfa56bb0 Mon Sep 17 00:00:00 2001 From: Arjan Draisma Date: Thu, 19 Dec 2024 09:14:17 +0100 Subject: [PATCH 1/2] split tests from badges yml --- .github/workflows/badges.yml | 28 ------------------------- .github/workflows/run-tests.yml | 36 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 28 deletions(-) create mode 100644 .github/workflows/run-tests.yml diff --git a/.github/workflows/badges.yml b/.github/workflows/badges.yml index 6bcfed64..ee2e3be0 100644 --- a/.github/workflows/badges.yml +++ b/.github/workflows/badges.yml @@ -5,34 +5,6 @@ on: branches: - master -jobs: - run_pytest: - runs-on: ubuntu-latest - if: ${{ !contains(github.event.head_commit.message, 'docs') && !contains(github.event.head_commit.message, 'documentation') }} - timeout-minutes: 15 - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Set up mamba environment - uses: mamba-org/setup-micromamba@v1 - with: - micromamba-version: '1.3.1-0' - environment-file: environment.yml - environment-name: BiG-SCAPE - init-shell: bash - generate-run-shell: true - - - name: Install dependencies - shell: micromamba-shell {0} - run: | - python -m pip install pytest - - - name: Test with Pytest - shell: micromamba-shell {0} - run: | - pytest - generate_coverage: runs-on: ubuntu-latest if: ${{ !contains(github.event.head_commit.message, 'docs') && !contains(github.event.head_commit.message, 'documentation') }} diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml new file mode 100644 index 00000000..589e11b9 --- /dev/null +++ b/.github/workflows/run-tests.yml @@ -0,0 +1,36 @@ +name: Run tests + +on: + push: + branches: + - master + - dev + - release/* + +jobs: + run_pytest: + runs-on: ubuntu-latest + if: ${{ !contains(github.event.head_commit.message, 'docs') && !contains(github.event.head_commit.message, 'documentation') }} + timeout-minutes: 15 + steps: + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up mamba environment + uses: mamba-org/setup-micromamba@v1 + with: + micromamba-version: '1.3.1-0' + environment-file: environment.yml + environment-name: BiG-SCAPE + init-shell: bash + generate-run-shell: true + + - name: Install dependencies + shell: micromamba-shell {0} + run: | + python -m pip install pytest + + - name: Test with Pytest + shell: micromamba-shell {0} + run: | + pytest From b05cf989a23758f8d954ba51b5e810cd20146307 Mon Sep 17 00:00:00 2001 From: Arjan Draisma Date: Thu, 19 Dec 2024 09:17:57 +0100 Subject: [PATCH 2/2] add more branch types --- .github/workflows/run-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 589e11b9..589e63fc 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -6,6 +6,8 @@ on: - master - dev - release/* + - feature/* + - hotfix/* jobs: run_pytest: