a-b-street/abstreet
1
1
Fork 0
mirror of https://github.com/a-b-street/abstreet.git synced 2024-11-23 08:54:30 +03:00
Code Issues Projects Releases Wiki Activity

Pin georust overrides to the main git repos, not branches. [rebuild] [release]

Browse Source 
The mkirk/concave-hull-fix-empty-crash branch was deleted recently,
causing CI failures. We can just pin to a recent commit on the main
branch.
This commit is contained in:
Dustin Carlino 2021-10-24 13:44:43 -07:00
parent 98b350418d
commit 0cff83d776
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -1359,7 +1359,7 @@ dependencies = [
[[package]]
name = "geo"
version = "0.18.0"
source = "git+https://github.com/georust/geo?branch=mkirk/concave-hull-fix-empty-crash#243ad260ba9dec5fe6ab5d184ac625f6ed01b53b"
source = "git+https://github.com/georust/geo#2ebbc7f8a8774d9a4a68e9a1b40bcdd22b02fac9"
dependencies = [
"geo-types",
"geographiclib-rs",
@ -1372,7 +1372,7 @@ dependencies = [
[[package]]
name = "geo-booleanop"
version = "0.3.2"
source = "git+https://github.com/michaelkirk/rust-geo-booleanop?branch=mkirk/geo-types-0.7#c1c6680bc5540d1378e0f6d269665281bf612169"
source = "git+https://github.com/21re/rust-geo-booleanop#188f016e44a3ec737ce8e279215caf558443de89"
dependencies = [
"float_next_after",
"geo-types",
@ -1383,7 +1383,7 @@ dependencies = [
[[package]]
name = "geo-types"
version = "0.7.2"
source = "git+https://github.com/georust/geo?branch=mkirk/concave-hull-fix-empty-crash#243ad260ba9dec5fe6ab5d184ac625f6ed01b53b"
source = "git+https://github.com/georust/geo#2ebbc7f8a8774d9a4a68e9a1b40bcdd22b02fac9"
dependencies = [
"approx",
"num-traits 0.2.14",

8
Cargo.toml
View File

@ -36,12 +36,12 @@ members = [
opt-level = 3
[patch.crates-io]
# update to geo-types 0.7 - upstream: https://github.com/21re/rust-geo-booleanop/pull/27
geo-booleanop = { git = "https://github.com/michaelkirk/rust-geo-booleanop", branch = "mkirk/geo-types-0.7" }
# Waiting for release: https://github.com/21re/rust-geo-booleanop/pull/27
geo-booleanop = { git = "https://github.com/21re/rust-geo-booleanop" }
# Waiting for a new crates.io release, but git uses latest geo versions
polylabel = { git = "https://github.com/urschrei/polylabel-rs" }
# Waiting on release of PR: https://github.com/georust/geo/pull/654
geo = { git = "https://github.com/georust/geo", branch = "mkirk/concave-hull-fix-empty-crash" }
geo-types = { git = "https://github.com/georust/geo", branch = "mkirk/concave-hull-fix-empty-crash" }
geo = { git = "https://github.com/georust/geo" }
geo-types = { git = "https://github.com/georust/geo" }

5
data/diff_changed_files.sh
View File

@ -1,5 +1,8 @@
#!/bin/bash
# TODO describe
# If `updater --dry` says a file changed, like
# `data/system/us/seattle/maps/montlake.bin`, call this to dump the old and new
# versions of the file to JSON and compare them manually. This only works if
# you have a copy of the S3 directory in ~/s3_abst_data.
set -e