Skip to content

Commit

Permalink
Bazel 0.27
Browse files Browse the repository at this point in the history
  • Loading branch information
guibou committed Jun 25, 2019
1 parent 05278a2 commit 5ce9b06
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 8 deletions.
22 changes: 22 additions & 0 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,28 @@ test:ci --test_output=errors
# see: https://github.com/tweag/rules_haskell/issues/647#issuecomment-459001362
test:windows --experimental_enable_runfiles

# WIP: bazel 0.27 fixs
build\
--incompatible_disable_genrule_cc_toolchain_dependency=false\
--incompatible_no_transitive_loads=false\
--incompatible_disable_deprecated_attr_params=false\
--incompatible_new_actions_api=false\
--incompatible_no_support_tools_in_action_inputs=false\
--incompatible_require_ctx_in_configure_features=false\
--incompatible_depset_is_not_iterable=false\
--incompatible_depset_union=false\
--incompatible_use_python_toolchains=false
test\
--incompatible_disable_genrule_cc_toolchain_dependency=false\
--incompatible_no_transitive_loads=false\
--incompatible_disable_deprecated_attr_params=false\
--incompatible_new_actions_api=false\
--incompatible_no_support_tools_in_action_inputs=false\
--incompatible_require_ctx_in_configure_features=false\
--incompatible_depset_is_not_iterable=false\
--incompatible_depset_union=false\
--incompatible_use_python_toolchains=false

# test environment does not propagate locales by default
# some tests reads files written in UTF8, we need to propagate the correct
# environment variables, such as LOCALE_ARCHIVE
Expand Down
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ jobs:
apt-get install -y wget gnupg golang make libgmp3-dev libtinfo-dev pkg-config zip g++ zlib1g-dev unzip python python3 bash-completion locales
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
locale-gen
wget "https://github.com/bazelbuild/bazel/releases/download/0.24.0/bazel_0.24.0-linux-x86_64.deb"
dpkg -i bazel_0.24.0-linux-x86_64.deb
wget "https://github.com/bazelbuild/bazel/releases/download/0.27.0/bazel_0.27.0-linux-x86_64.deb"
dpkg -i bazel_0.27.0-linux-x86_64.deb
echo "common:ci --build_tag_filters -requires_hackage,-requires_zlib,-requires_doctest,-requires_c2hs,-requires_threaded_rts,-dont_test_with_bindist" > .bazelrc.local
- run:
name: Build tests
Expand Down
2 changes: 1 addition & 1 deletion .netlify/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eux

V=0.20.0
V=0.27.0

curl -LO https://github.com/bazelbuild/bazel/releases/download/$V/bazel-$V-installer-linux-x86_64.sh
chmod +x bazel-$V-installer-linux-x86_64.sh
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
architecture: 'x64'
- bash: |
set -e
curl -LO https://github.com/bazelbuild/bazel/releases/download/0.24.0/bazel-0.24.0-windows-x86_64.exe
curl -LO https://github.com/bazelbuild/bazel/releases/download/0.27.0/bazel-0.27.0-windows-x86_64.exe
mv bazel-*.exe bazel.exe
mkdir /c/bazel
mv bazel.exe /c/bazel
Expand Down
5 changes: 2 additions & 3 deletions nixpkgs/default.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import (fetchTarball {
# Checkout from 2019-05-06.
url = https://github.com/mboes/nixpkgs/archive/361e9185c83166b44419e05e75fc8473875df6ea.tar.gz;
sha256 = "0c6izp9i1ln4yy2h9jlm48k94f018h8pw60jfbhq49p076aaafrb";
url = https://github.com/NixOS/nixpkgs/archive/a2075a2c314ccb3df6522dd957bb4e237446dc49.tar.gz;
sha256 = "1jbnjw06mca7867q81v3i3jljj0wpm38y9zjwij3nd6pp2bqhvbr";
})
1 change: 0 additions & 1 deletion shell.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{ pkgs ? import ./nixpkgs {}, docTools ? true }:

with pkgs;

mkShell {
# XXX: hack for macosX, this flags disable bazel usage of xcode
# Note: this is set even for linux so any regression introduced by this flag
Expand Down

0 comments on commit 5ce9b06

Please sign in to comment.