Skip to content

Commit

Permalink
Merge 538e9d6 into dcd6c0a
Browse files Browse the repository at this point in the history
  • Loading branch information
gjasny committed May 13, 2020
2 parents dcd6c0a + 538e9d6 commit b9bfea7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 20 deletions.
16 changes: 0 additions & 16 deletions .github/scripts/run-prepare
Expand Up @@ -10,11 +10,6 @@ case "${OS_ARG}" in
packages=(locales)

case "${BUILDSYSTEM_ARG}" in
bazel)
curl -sL https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
packages+=(bazel)
;;
cmake)
packages+=(python-pip python-wheel)
;;
Expand All @@ -33,22 +28,11 @@ case "${OS_ARG}" in

macOS*)
packages=(prometheus telegraf)

case "${BUILDSYSTEM_ARG}" in
bazel)
packages+=(bazelbuild/tap/bazel)
;;
cmake)
;;
esac

brew install "${packages[@]}"
;;
esac

case "${BUILDSYSTEM_ARG}" in
bazel)
;;
cmake)
"${VCPKG_INSTALLATION_ROOT}/vcpkg" install benchmark civetweb curl gtest zlib
;;
Expand Down
4 changes: 0 additions & 4 deletions .github/scripts/run-prepare.cmd
@@ -1,7 +1,3 @@
if [%1] == [bazel] (
choco install bazel -y || EXIT /B 1
)

if [%1] == [cmake] (
%VCPKG_INSTALLATION_ROOT%/vcpkg install benchmark civetweb curl gtest zlib || EXIT /B 1
)
Expand Down

0 comments on commit b9bfea7

Please sign in to comment.