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

[ci] use 'rust-ci:latest-proj' #745

Merged
merged 3 commits into from
Feb 23, 2021
Merged

[ci] use 'rust-ci:latest-proj' #745

merged 3 commits into from
Feb 23, 2021

Conversation

woshilapin
Copy link
Contributor

@woshilapin woshilapin commented Feb 16, 2021

Use now the custom image that already contains rustfmt, clippy,cargo-audit and libproj. This should improve the build time and make it more reliable with libproj since we're not depending anymore on the custom .deb.

antoine-de
antoine-de previously approved these changes Feb 16, 2021
pbougue
pbougue previously approved these changes Feb 17, 2021
@woshilapin woshilapin dismissed stale reviews from pbougue and antoine-de via 349c181 February 17, 2021 21:12
@woshilapin
Copy link
Contributor Author

  • I removed all EPSG:* instance of the code to not depend anymore on proj-data (see 9530a1a)
  • I updated the Dockerfile to not depend anymore on .deb for proj (see 311d832)
  • cargo-tarpaulin seems to be in need of pkg-config and libssl-dev (see b7694b6)

Copy link
Contributor

@pbougue pbougue left a comment

Choose a reason for hiding this comment

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

Can you also update Makefile and readme to tell we're using proj 7.2.1 and not 7.1.0 anymore?

✔️ Done

@woshilapin
Copy link
Contributor Author

Can you also update Makefile and readme to tell we're using proj 7.2.1 and not 7.1.0 anymore?

Should be good now, I've fixed it in b27f79f.

'EPSG:*' creates a dependency on 'proj-data' which is harder to maintain. We're
using the website epsg.io to know the exact string to use in replacement.
ENV PATH "/root/.cargo/bin:$PATH"
# build the project
RUN cargo build --workspace --release
RUN mkdir /usr/src/bin && for file in ls ./target/release/*; do if test -f $file -a -x $file; then cp $file /usr/src/bin; fi; done
Copy link
Contributor

@pbougue pbougue Feb 22, 2021

Choose a reason for hiding this comment

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

minor

Suggested change
RUN mkdir /usr/src/bin && for file in ls ./target/release/*; do if test -f $file -a -x $file; then cp $file /usr/src/bin; fi; done
RUN mkdir /usr/src/bin && for file in ls ./target/release/*; do if test -f $file -a -x $file; then cp $file /usr/src/bin; fi; done

@pbougue pbougue merged commit 60150c5 into hove-io:master Feb 23, 2021
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.

3 participants