Skip to content

Commit

Permalink
Run ci/cd tests on push to main (#55)
Browse files Browse the repository at this point in the history
This is a minor change for ci/cd to also run on pushes to main (which
then includes the push created when a branch is merged). Also changed
ci/cd badges to only look at the main branch.
  • Loading branch information
SimonKamuk authored Jun 10, 2024
1 parent c8d3553 commit 96f193e
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 10 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
name: Linting

on:
# trigger on pushes to any branch, but not main
# trigger on pushes to any branch
push:
branches-ignore:
- main
# and also on PRs to main
pull_request:
branches:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/run_tests.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
name: Unit Tests

on:
# trigger on pushes to any branch, but not main
# trigger on pushes to any branch
push:
branches-ignore:
- main
# and also on PRs to main
pull_request:
branches:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [unreleased](https://github.com/joeloskarsson/neural-lam/compare/v0.1.0...HEAD)

### Added
- Added tests for loading dataset, creating graph, and training model based on reduced MEPS dataset stored on AWS S3, along with automatic running of tests on push/PR to GitHub. Added caching of test data tp speed up running tests.
[/#38](https://github.com/mllam/neural-lam/pull/38)
- Added tests for loading dataset, creating graph, and training model based on reduced MEPS dataset stored on AWS S3, along with automatic running of tests on push/PR to GitHub, including push to main branch. Added caching of test data to speed up running tests.
[\#38](https://github.com/mllam/neural-lam/pull/38) [\#55](https://github.com/mllam/neural-lam/pull/55)
@SimonKamuk

- Replaced `constants.py` with `data_config.yaml` for data configuration management
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
![Linting](https://github.com/mllam/neural-lam/actions/workflows/pre-commit.yml/badge.svg)
![Automatic tests](https://github.com/mllam/neural-lam/actions/workflows/run_tests.yml/badge.svg)
![Linting](https://github.com/mllam/neural-lam/actions/workflows/pre-commit.yml/badge.svg?branch=main)
![Automatic tests](https://github.com/mllam/neural-lam/actions/workflows/run_tests.yml/badge.svg?branch=main)

<p align="middle">
<img src="figures/neural_lam_header.png" width="700">
Expand Down

0 comments on commit 96f193e

Please sign in to comment.