georust / proj

Rust bindings for the latest stable release of PROJ
https://docs.rs/proj
Apache License 2.0
138 stars 45 forks source link

Unify proj and proj-sys crates in a single workspace #42

Closed urschrei closed 3 years ago

urschrei commented 3 years ago

Closes https://github.com/georust/proj-sys/issues/26

cc @michaelkirk

michaelkirk commented 3 years ago

Also, if you're feeling ambitious and want to maintain history for proj-sys, see https://stackoverflow.com/questions/1425892/how-do-you-merge-two-git-repositories

michaelkirk commented 3 years ago

Swap Travis for Github actions 👀

🎉

urschrei commented 3 years ago

@michaelkirk Ah, but cmake is very much installed 🧐

michaelkirk commented 3 years ago

@michaelkirk Ah, but cmake is very much installed 🧐

Taking a look just now @urschrei!

michaelkirk commented 3 years ago

@michaelkirk Ah, but cmake is very much installed 🧐

FWIW cmake does not seem to be installed on geo-ci:latest

[10:35:05] ~/src/georust/proj (workspace)
$ docker pull georust/geo-ci            
Using default tag: latest
latest: Pulling from georust/geo-ci
Digest: sha256:5d30cdbdce6c676452cedd5e17d32c387ebb53e70dd2353dd117c6f8efa622a6
Status: Image is up to date for georust/geo-ci:latest
docker.io/georust/geo-ci:latest

[10:35:09] ~/src/georust/proj (workspace)
$ docker run -ti georust/geo-ci bash -l

root@5e232f9e162e:/# cmake
bash: cmake: command not found

root@5e232f9e162e:/# apt update > /dev/null

root@5e232f9e162e:/# apt install cmake
Reading package lists... Done
Building dependency tree       
Reading state information... Done
The following additional packages will be installed:
  cmake-data libarchive13 libicu66 libjsoncpp1 librhash0 libuv1 libxml2 make tzdata
Suggested packages:
  cmake-doc ninja-build lrzip make-doc
The following NEW packages will be installed:
  cmake cmake-data libarchive13 libicu66 libjsoncpp1 librhash0 libuv1 libxml2 make tzdata
0 upgraded, 10 newly installed, 0 to remove and 0 not upgraded.
Need to get 15.5 MB of archives.
After this operation, 69.4 MB of additional disk space will be used.
Do you want to continue? [Y/n] 
michaelkirk commented 3 years ago

Ok - I think I see what's going on. I'm going to test locally and push up a change to geo-ci momentarily.

(If you want a preview: https://github.com/georust/docker-images/tree/mkirk/missing-deps)

urschrei commented 3 years ago

@michaelkirk https://github.com/urschrei/rust-proj/actions/runs/280093108 💯

urschrei commented 3 years ago

@michaelkirk I've fixed up the links and metadata and bumped the versions so everything is pointing to the right place. I think we're good to go?

michaelkirk commented 3 years ago

bors r+

don't let me down bors.

michaelkirk commented 3 years ago

don't let me down bors.

😞

I'm going to follow up with a new branch to fix the bors config since this branch lives on your fork @urschrei

bors[bot] commented 3 years ago

Timed out.