From 96f193e0ba61438cdf8033f16d8d4d03a2c6aad7 Mon Sep 17 00:00:00 2001 From: SimonKamuk <43374850+SimonKamuk@users.noreply.github.com> Date: Mon, 10 Jun 2024 11:24:58 +0200 Subject: [PATCH] Run ci/cd tests on push to main (#55) 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. --- .github/workflows/pre-commit.yml | 4 +--- .github/workflows/run_tests.yml | 4 +--- CHANGELOG.md | 4 ++-- README.md | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index dadac50d..ad2b1a9c 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -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: diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 71bff3d3..4c677908 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -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: diff --git a/CHANGELOG.md b/CHANGELOG.md index f4680c37..d109dcb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/README.md b/README.md index 1bdc6602..26d844f7 100644 --- a/README.md +++ b/README.md @@ -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)