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

Fix CI #124

Merged
merged 2 commits into from
Apr 18, 2022
Merged

Fix CI #124

merged 2 commits into from
Apr 18, 2022

Conversation

michaelkirk
Copy link
Member

No description provided.

@michaelkirk
Copy link
Member Author

Hmm CI is failing on macos proj-sys:

---- src/lib.rs - (line 142) stdout ----
thread 'main' panicked at 'assert_relative_eq!(result.x(), 158458.67, epsilon = 1e-2)
    left  = 158460.18744483535
    right = 158458.67

Looking into it...

@nyurik
Copy link
Member

nyurik commented Apr 17, 2022

@michaelkirk would it make sense to do an interim release of the proj up to e39a671 - without the 9.0 update?

@michaelkirk
Copy link
Member Author

@michaelkirk would it make sense to do an interim release of the proj up to e39a671 - without the 9.0 update?

If you want to make a branch that passes CI from there I'd consider it.

@nyurik
Copy link
Member

nyurik commented Apr 17, 2022

@michaelkirk would it make sense to do an interim release of the proj up to e39a671 - without the 9.0 update?

If you want to make a branch that passes CI from there I'd consider it.

@michaelkirk https://github.com/georust/proj/compare/v0.25?expand=1 (not for merging into main) -- the v0.25 branch

Sigh, seems like we have so much cross-repo dependencies, it is not possible to simply update a little thing - because it depends on the latest (?) release of geo, which has already been updated to 2021 edition. We ought to make it less tightly coupled, so that each project can be easily released without breaking the whole CI chain elsewhere

@michaelkirk
Copy link
Member Author

Wild!

This is the last build that succeeded https://github.com/georust/proj/runs/5796562852?check_suite_focus=true#step:3:10

> ==> Downloading https://ghcr.io/v2/homebrew/core/proj/manifests/9.0.0_1
...
> ==> Pouring proj--9.0.0_1.big_sur.bottle.tar.gz
> 🍺  /usr/local/Cellar/proj/9.0.0_1: 73 files, 19MB

And this build failed:
https://github.com/georust/proj/runs/6056168754?check_suite_focus=true#step:3:10

> ==> Downloading https://ghcr.io/v2/homebrew/core/proj/manifests/9.0.0_1-1
> ==> Pouring proj--9.0.0_1.big_sur.bottle.1.tar.gz
...
> 🍺  /usr/local/Cellar/proj/9.0.0_1: 436 files, 588MB

I wonder if the new (much larger) bottle contains some of the offline grid data or something, causing different results.

@michaelkirk
Copy link
Member Author

michaelkirk commented Apr 17, 2022

Here are the two changes between the 9.0.0_1 vs 9.0.0_1-1 bottles:

seems probably innocuous:

statically link libraries:

Homebrew/homebrew-core@89a28a5

🚨supports my theory about offline data changing:

Replace deprecated proj-datumgrid with proj-data

Homebrew/homebrew-core@b3e7a63

@michaelkirk
Copy link
Member Author

michaelkirk commented Apr 18, 2022

In a hilarious (my bad) turn of events, the "proj-sys" CI for macos was actually only running tests for "proj", not "proj-sys".

I think they are failing because that job is using libproj from homebrew, rather than bundled proj. Homebrew recently started including some grid data in it's installation: Homebrew/homebrew-core@b3e7a63

Which gives different, presumably better, results. Maybe we should be doing that for our build too? That's another discussion though (I opened an issue: #125)

I think this can be merged!

(and then I think the release/0.26.0 should go out)

@michaelkirk michaelkirk changed the title update MSRV to rust-1.56 to match latest geo-types Fix CI Apr 18, 2022
Copy link
Member

@nyurik nyurik left a comment

Choose a reason for hiding this comment

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

lgtm!

@nyurik
Copy link
Member

nyurik commented Apr 18, 2022

well done!

@michaelkirk
Copy link
Member Author

bors r+

@bors
Copy link
Contributor

bors bot commented Apr 18, 2022

Build succeeded:

@bors bors bot merged commit 41e4fd1 into main Apr 18, 2022
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.

2 participants