Merge branch 'master' into feature/workspace/protoc

This commit is contained in:
Shao Yu-Lung (Allen)
2020-09-15 22:04:00 +08:00
committed by GitHub
3 changed files with 12 additions and 1 deletions

View File

@ -151,6 +151,7 @@ services:
- INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
- INSTALL_WKHTMLTOPDF=${WORKSPACE_INSTALL_WKHTMLTOPDF}
- INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
- INSTALL_LNAV=${WORKSPACE_INSTALL_LNAV}
- INSTALL_PROTOC=${WORKSPACE_INSTALL_PROTOC}
- PROTOC_VERSION=${WORKSPACE_PROTOC_VERSION}
- http_proxy