diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index 698764d75..6061ea1ce 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -3,10 +3,10 @@ name: Bazel CI on: # Trigger the workflow on push or pull request, # but only for the master branch - # push: - # branches: - # - master - # pull_request: {} + push: + branches: + - master + pull_request: {} jobs: build: @@ -41,5 +41,5 @@ jobs: - name: Build & test run: | bin/bazel clean - bin/bazel test --sandbox_debug --config=ci --test_tag_filters=language-test //... - bin/bazel test --sandbox_debug --config=ci //semantic-source //semantic:spec + bin/bazel test --config=ci --test_tag_filters=language-test //... + bin/bazel test --config=ci //semantic-source //semantic:spec diff --git a/WORKSPACE b/WORKSPACE index c0df66213..ce603a5bc 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -17,9 +17,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") # [1] https://github.com/tweag/rules_haskell/issues/1349 http_archive( name = "rules_haskell", - sha256 = "5e8077ae243b4bcf7bb913dfd9b4335c3b4bd2554658c62db7b3eb5351c80d8e", - strip_prefix = "rules_haskell-aabeedc18f5e5db030ca1aa0c10a7dc14e4a4a55", - urls = ["https://github.com/tweag/rules_haskell/archive/aabeedc18f5e5db030ca1aa0c10a7dc14e4a4a55.tar.gz"], + sha256 = "cd07e421281c3ad286574ae235f39165e294c850fa4cdf03b5683547d8822c34", + strip_prefix = "rules_haskell-1254b1d9bee9e82cd70c4f7941cb64b8ec048bac", + urls = ["https://github.com/tweag/rules_haskell/archive/1254b1d9bee9e82cd70c4f7941cb64b8ec048bac.tar.gz"], ) load( @@ -38,7 +38,7 @@ load( # Download a GHC binary distribution from haskell.org and register it as a toolchain. rules_haskell_toolchains( locale = "en_US.UTF-8", - version = "8.10.1", + version = "8.10.2", ) # Enable GHC persistent worker mode, if that's your bag. @@ -94,7 +94,6 @@ stack_snapshot( "hspec", "hspec-core", "hspec-expectations", - "proto-lens-jsonpb", "lens", "lingo", "network", @@ -108,6 +107,7 @@ stack_snapshot( "prettyprinter-ansi-terminal", "process", "proto-lens", + "proto-lens-jsonpb", "proto-lens-runtime", "raw-strings-qq", "recursion-schemes",