Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrating CI from cirrus to GHA #271

Merged
merged 75 commits into from
May 23, 2023
Merged

Migrating CI from cirrus to GHA #271

merged 75 commits into from
May 23, 2023

Conversation

HGWright
Copy link
Contributor

All of the CI performed by the cirrus has now been made into separate GHA.

A couple of other files also had to change to facilitate this migration.

closes #265

@codecov
Copy link

codecov bot commented May 19, 2023

Codecov Report

Merging #271 (228f06c) into main (1690171) will increase coverage by 0.05%.
The diff coverage is 99.76%.

❗ Current head 228f06c differs from pull request most recent head d8c2bb4. Consider uploading reports for the commit d8c2bb4 to get more accurate results

@@            Coverage Diff             @@
##             main     #271      +/-   ##
==========================================
+ Coverage   98.73%   98.79%   +0.05%     
==========================================
  Files          30       33       +3     
  Lines        3323     3563     +240     
==========================================
+ Hits         3281     3520     +239     
- Misses         42       43       +1     
Impacted Files Coverage Δ
esmf_regrid/experimental/unstructured_scheme.py 93.93% <ø> (ø)
...sts/unit/schemes/test_ESMFAreaWeightedRegridder.py 100.00% <ø> (ø)
...d/tests/unit/schemes/test_ESMFBilinearRegridder.py 100.00% <ø> (ø)
...f_regrid/tests/unit/schemes/test__ESMFRegridder.py 100.00% <ø> (ø)
esmf_regrid/schemes.py 96.04% <96.42%> (-0.05%) ⬇️
esmf_regrid/esmf_regridder.py 95.58% <100.00%> (+0.13%) ⬆️
.../tests/unit/experimental/io/test_round_tripping.py 100.00% <100.00%> (ø)
...nstructured_scheme/test_GridToMeshESMFRegridder.py 100.00% <100.00%> (ø)
...nstructured_scheme/test_MeshToGridESMFRegridder.py 97.11% <100.00%> (+0.05%) ⬆️
..._scheme/test_regrid_rectilinear_to_unstructured.py 100.00% <100.00%> (ø)
... and 6 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Contributor

@trexfeathers trexfeathers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice job @HGWright! I'm sure @stephenworsley is extra glad you've put in the work, so he has been able to focus on the code-base.

Some modifications for you...

noxfile.py Show resolved Hide resolved
.github/workflows/ci-wheels.yml Outdated Show resolved Hide resolved
.github/workflows/ci-wheels.yml Outdated Show resolved Hide resolved
.github/workflows/ci-wheels.yml Show resolved Hide resolved
.github/workflows/ci-wheels.yml Outdated Show resolved Hide resolved
.github/workflows/ci-wheels.yml Show resolved Hide resolved
.github/workflows/ci-tests.yml Outdated Show resolved Hide resolved
.github/workflows/ci-tests.yml Outdated Show resolved Hide resolved
uses: actions/checkout@v3
with:
fetch-depth: 0
- run: git checkout HEAD^2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth a comment here, to explain that this checks out the HEAD of the Pull Request, instead of using GHA's default simulated merge commit.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❗ This block should also be conditional - only run when on a pull request.

The same action also runs post-merge, and in that situation should run on the default commit with no modifications.

That's why the below line also has a similar check:

https://github.com/SciTools-incubator/iris-esmf-regrid/blob/e6c4cd769d821ce0b9a340df7b0bfffe10a06773/.github/workflows/benchmark.yml#L69

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see bb271a9

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This thread still needs resolving

see bb271a9

... also needs a tweak: #271 (comment)

stephenworsley and others added 4 commits May 19, 2023 16:36
* add nearest neighbour regridding

* fix tests

* further improvements, reintroduce mask keywords

* fix tests

* change test name

* add tests

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* flake fix

* update changelog

* address review comments

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* flake fix

* address review comments

* parameterise test

* add Raises section to docstrings

* fix docstrings

* fill out __all__

* address review comments

* further test parameterisation.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
.github/workflows/benchmark.yml Outdated Show resolved Hide resolved
stephenworsley and others added 2 commits May 22, 2023 17:07
Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>
Co-authored-by: Martin Yeo <40734014+trexfeathers@users.noreply.github.com>
@trexfeathers
Copy link
Contributor

Cracking job @HGWright! And thanks @stephenworsley for helping it over the line.

@trexfeathers trexfeathers merged commit 7a98c7d into SciTools:main May 23, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Migrate to GitHub Actions
3 participants