Skip to content

Commit 902e46b

Browse files
committed
CI: remove the matrix.cli parameter
It hasn't been used for a while now.
1 parent 8e769cd commit 902e46b

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

.github/workflows/validate.yml

+3-7
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ jobs:
107107
- name: Set validate inputs
108108
run: |
109109
FLAGS="${{ env.COMMON_FLAGS }}"
110-
if [[ "${{ matrix.cli }}" == "false" ]]; then
111-
FLAGS="$FLAGS --lib-only"
112-
fi
113110
if [[ ${{ matrix.ghc }} == ${{ env.GHC_FOR_SOLVER_BENCHMARKS }} ]]; then
114111
FLAGS="$FLAGS --solver-benchmarks"
115112
fi
@@ -133,7 +130,7 @@ jobs:
133130
run: sh validate.sh $FLAGS -s build
134131

135132
- name: Tar cabal head executable
136-
if: matrix.cli != 'false' && matrix.ghc == env.GHC_FOR_RELEASE
133+
if: matrix.ghc == env.GHC_FOR_RELEASE
137134
run: |
138135
CABAL_EXEC=$(cabal-plan list-bin --builddir=dist-newstyle-validate-ghc-${{ matrix.ghc }} cabal-install:exe:cabal)
139136
# We have to tar the executable to preserve executable permissions
@@ -155,7 +152,7 @@ jobs:
155152
# - Reuse it in the dogfooding job (although we could use the cached build dir)
156153
# - Make it available in the workflow to make easier testing it locally
157154
- name: Upload cabal-install executable to workflow artifacts
158-
if: matrix.cli != 'false' && matrix.ghc == env.GHC_FOR_RELEASE
155+
if: matrix.ghc == env.GHC_FOR_RELEASE
159156
uses: actions/upload-artifact@v3
160157
with:
161158
name: cabal-${{ runner.os }}-${{ matrix.ghc }}
@@ -176,12 +173,11 @@ jobs:
176173
run: sh validate.sh $FLAGS -s lib-suite
177174

178175
- name: Validate cli-tests
179-
if: matrix.cli != 'false'
180176
run: sh validate.sh $FLAGS -s cli-tests
181177

182178
- name: Validate cli-suite
183179
# Have to disable *-suite validation, see above the comment for lib-suite
184-
if: ((runner.os != 'Windows') || (matrix.ghc != '9.6.1')) && (matrix.cli != 'false')
180+
if: (runner.os != 'Windows') || (matrix.ghc != '9.6.1')
185181
run: sh validate.sh $FLAGS -s cli-suite
186182

187183
validate-old-ghcs:

0 commit comments

Comments
 (0)