Skip to content

Commit d9164b1

Browse files
committed
Revert changes to workflow.yaml.
1 parent 95c8a3d commit d9164b1

File tree

1 file changed

+5
-35
lines changed

1 file changed

+5
-35
lines changed

.github/workflows/workflow.yaml

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,13 @@ jobs:
4343
strategy:
4444
fail-fast: false
4545
matrix:
46-
# TODO(chuck): FIX ME!
47-
# os: [ubuntu-latest, macos-latest]
48-
# module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
49-
# DEBUG BEGIN
50-
os: [macos-latest]
51-
module: [rules_haskell_tests]
52-
# DEBUG END
53-
# TODO(chuck): FIX ME!
54-
# bzlmod: [true, false]
55-
# ghc:
56-
# - 9.2.8
57-
# - 9.4.6
58-
# - 9.6.2
59-
# DEBUG BEGIN
60-
bzlmod: [true]
46+
os: [ubuntu-latest, macos-latest]
47+
module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
48+
bzlmod: [true, false]
6149
ghc:
6250
- 9.2.8
63-
# DEBUG END
51+
- 9.4.6
52+
- 9.6.2
6453
exclude:
6554
- module: rules_haskell_nix
6655

@@ -110,10 +99,6 @@ jobs:
11099
EOF
111100
cp .bazelrc.local rules_haskell_nix
112101
cp .bazelrc.local rules_haskell_tests
113-
# DEBUG BEGIN
114-
- name: Setup tmate session
115-
uses: mxschmitt/action-tmate@v3
116-
# DEBUG END
117102
- name: Build & test - rules_haskell
118103
if: matrix.module == 'rules_haskell'
119104
uses: tweag/run-nix-shell@v0
@@ -136,9 +121,6 @@ jobs:
136121
with:
137122
options: ${{ env.NIX_SHELL_ARGS }}
138123
working-directory: rules_haskell_tests
139-
# DEBUG BEGIN
140-
# pure: false
141-
# DEBUG END
142124
run: |
143125
# XXX run start script `--with-bzlmod=true` when supported
144126
if ! ${{ matrix.bzlmod }}; then
@@ -148,19 +130,7 @@ jobs:
148130
# Shutdown Bazel to free up memory
149131
# https://github.com/tweag/rules_haskell/issues/2089.
150132
bazel shutdown
151-
# # DEBUG BEGIN
152-
# echo >&2 "CHUCK BEFORE"
153-
# # top -l 1 -s 0 -o mem | head -n 25 >&2
154-
# top -l 1 -s 0 -o mem >&2
155-
# echo >&2 "run-tests"
156-
# # DEBUG END
157133
./bazel-ci-bin/tests/run-tests
158-
# ./bazel-ci-bin/tests/run-tests || true
159-
# # DEBUG BEGIN
160-
# echo >&2 "CHUCK AFTER"
161-
# # top -l 1 -s 0 -o mem | head -n 25 >&2
162-
# top -l 1 -s 0 -o mem >&2
163-
# # DEBUG END
164134
bazel coverage //...
165135
166136
test-bindist:

0 commit comments

Comments
 (0)