Skip to content

Commit

Permalink
apollo: update proj4 dep (ApolloAuto#8822)
Browse files Browse the repository at this point in the history
* apollo: update proj4 dep

Somehow, the link is the same but the remote file has been changed.
* update the prefix from the current zip file
* add sha256 to detect future changes.

Ideally, we should add sha256 for all the deps download remotely

* docker: update x86 dev docker image with new proj4 dependencies

Due to the internal file structure changes in proj4, we have to
update the WORKSPACE.in and docker image to match it
  • Loading branch information
quning18 authored Jun 16, 2019
1 parent 22740ec commit c378ba0
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
env:
- JOB=lint
script:
- ./docker/scripts/dev_start.sh -t dev-x86_64-20190604_1720 --fast-build
- ./docker/scripts/dev_start.sh -t dev-x86_64-20190616_1149 --fast-build
- ./apollo_docker.sh ${JOB}
- rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
- rm -rf "/apollo/data/core"
Expand All @@ -31,31 +31,31 @@ jobs:
env:
- JOB=cibuild
script:
- ./docker/scripts/dev_start.sh -t dev-x86_64-20190604_1720 --fast-build
- ./docker/scripts/dev_start.sh -t dev-x86_64-20190616_1149 --fast-build
- ./apollo_docker.sh ${JOB}
- rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
- rm -rf "/apollo/data/core"
- # stage: stage-02
env:
- JOB=cibuild_extended
script:
- ./docker/scripts/dev_start.sh -t dev-x86_64-20190604_1720 --fast-build
- ./docker/scripts/dev_start.sh -t dev-x86_64-20190616_1149 --fast-build
- ./apollo_docker.sh ${JOB}
- rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
- rm -rf "/apollo/data/core"
- # stage: stage-02
env:
- JOB=citest_basic
script:
- ./docker/scripts/dev_start.sh -t dev-x86_64-20190604_1720 --fast-test
- ./docker/scripts/dev_start.sh -t dev-x86_64-20190616_1149 --fast-test
- ./apollo_docker.sh ${JOB}
- rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
- rm -rf "/apollo/data/core"
- # stage: stage-02
env:
- JOB=citest_extended
script:
- ./docker/scripts/dev_start.sh -t dev-x86_64-20190604_1720 --fast-test
- ./docker/scripts/dev_start.sh -t dev-x86_64-20190616_1149 --fast-test
- ./apollo_docker.sh ${JOB}
- rm -rf "${HOME}/.cache/bazel/_bazel_${USER}/install"
- rm -rf "/apollo/data/core"
Expand Down
3 changes: 2 additions & 1 deletion WORKSPACE.in
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ new_local_repository(
new_http_archive(
name = "proj4",
build_file = "third_party/proj4.BUILD",
strip_prefix = "proj.4-4.9.3",
strip_prefix = "PROJ-4.9.3",
sha256 = "9d6d845ae77928441631882e25177117534dbe4311b823ee35eb100d3b69a78e",
url = "file:///home/tmp/proj.4-4.9.3.zip",
)

Expand Down
2 changes: 1 addition & 1 deletion docker/scripts/dev_start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ FAST_BUILD_MODE="no"
FAST_TEST_MODE="no"
VERSION=""
ARCH=$(uname -m)
VERSION_X86_64="dev-x86_64-20190604_1720"
VERSION_X86_64="dev-x86_64-20190616_1149"
VERSION_AARCH64="dev-aarch64-20170927_1111"
VERSION_OPT=""

Expand Down

0 comments on commit c378ba0

Please sign in to comment.