Skip to content

Commit

Permalink
Merge pull request #1509 from tweag/start-darwin
Browse files Browse the repository at this point in the history
Test start script on MacOS CI
  • Loading branch information
aherrmann authored Mar 16, 2021
2 parents 60ed30a + 5f1995d commit 998e23d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 14 deletions.
16 changes: 5 additions & 11 deletions .github/workflows/workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,11 @@ jobs:
nix-shell --arg docTools false --pure --run .ci/check-bazel-version
- name: Build & test
run: |
# XXX 2019-01-22 Disable start script checking on Darwin
# due to a clash between binutils and clang.
[[ ${{ matrix.os }} != macos ]] &&
nix-shell --arg docTools false --pure --run \
'./tests/run-start-script.sh --use-nix'
nix-shell --arg docTools false --pure --run '
bazel build //tests:run-tests &&
./bazel-ci-bin/tests/run-tests &&
set -euo pipefail
./tests/run-start-script.sh --use-nix
bazel build //tests:run-tests
./bazel-ci-bin/tests/run-tests
bazel coverage //tests/...
'
test-bindist:
Expand Down Expand Up @@ -97,10 +94,7 @@ jobs:
run: |
export PATH=$HOME/bazel:$PATH
[[ ${{ matrix.os }} == macos ]] && export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1
# XXX 2019-01-22 Disable start script checking on Darwin
# due to a clash between binutils and clang.
[[ ${{ matrix.os }} != macos ]] && \
./tests/run-start-script.sh --use-bindists
./tests/run-start-script.sh --use-bindists
bazel test //tests/...
# Test stack_snapshot pinning
# NOTE keep in sync with tests/RunTests.hs
Expand Down
11 changes: 8 additions & 3 deletions start
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ load(
# https://github.com/tweag/rules_nixpkgs/blob/master/README.md
nixpkgs_git_repository(
name = "nixpkgs",
revision = "19.03",
revision = "20.09",
# sha256 = …
)
Expand All @@ -176,7 +176,7 @@ load(
haskell_register_ghc_nixpkgs(
repository = "@nixpkgs",
attribute_path = "ghc",
version = "8.6.4",
version = "8.8.4",
)
EOF
)
Expand All @@ -199,7 +199,12 @@ cc_library(
includes = ["."],
visibility = ["//visibility:public"],
)
cc_library(name = "z", srcs = glob(["*.c"]), hdrs = glob(["*.h"]))
cc_library(
name = "z",
srcs = glob(["*.c"]),
hdrs = glob(["*.h"]),
copts = ["-Wno-implicit-function-declaration"],
)
EOF
;;

Expand Down

0 comments on commit 998e23d

Please sign in to comment.