Skip to content

Commit

Permalink
Merge pull request #164 from ImperialCollegeLondon/workflow_overhead
Browse files Browse the repository at this point in the history
Update ci.yml
  • Loading branch information
barneydobson authored May 15, 2024
2 parents c4da7d3 + d6413d2 commit ef3a24d
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 6 deletions.
21 changes: 20 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ windows-latest, ubuntu-latest, macos-latest ]
os: [ubuntu-latest, windows-latest]
python-version: [ "3.10" ]
steps:
- uses: actions/checkout@v4
Expand All @@ -26,3 +26,22 @@ jobs:
run: pip install -r dev-requirements.txt
- name: Run tests
run: pytest

test-pr-merge:
needs: qa
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [windows-latest, macos-latest, ubuntu-latest]
python-version: [ "3.10" ]
if: github.event.pull_request.merged == true
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: pip install -r dev-requirements.txt
- name: Run tests
run: pytest
6 changes: 1 addition & 5 deletions tests/test_geospatial_utilities.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
# -*- coding: utf-8 -*-
"""Created on Tue Oct 18 10:35:51 2022.
@author: Barney
"""
"""Misc line to trigger workflow."""
from __future__ import annotations

import tempfile
Expand Down

0 comments on commit ef3a24d

Please sign in to comment.