@@ -107,9 +107,6 @@ jobs:
107
107
- name : Set validate inputs
108
108
run : |
109
109
FLAGS="${{ env.COMMON_FLAGS }}"
110
- if [[ "${{ matrix.cli }}" == "false" ]]; then
111
- FLAGS="$FLAGS --lib-only"
112
- fi
113
110
if [[ ${{ matrix.ghc }} == ${{ env.GHC_FOR_SOLVER_BENCHMARKS }} ]]; then
114
111
FLAGS="$FLAGS --solver-benchmarks"
115
112
fi
@@ -133,7 +130,7 @@ jobs:
133
130
run : sh validate.sh $FLAGS -s build
134
131
135
132
- name : Tar cabal head executable
136
- if : matrix.cli != 'false' && matrix. ghc == env.GHC_FOR_RELEASE
133
+ if : matrix.ghc == env.GHC_FOR_RELEASE
137
134
run : |
138
135
CABAL_EXEC=$(cabal-plan list-bin --builddir=dist-newstyle-validate-ghc-${{ matrix.ghc }} cabal-install:exe:cabal)
139
136
# We have to tar the executable to preserve executable permissions
@@ -155,7 +152,7 @@ jobs:
155
152
# - Reuse it in the dogfooding job (although we could use the cached build dir)
156
153
# - Make it available in the workflow to make easier testing it locally
157
154
- 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
159
156
uses : actions/upload-artifact@v3
160
157
with :
161
158
name : cabal-${{ runner.os }}-${{ matrix.ghc }}
@@ -176,12 +173,11 @@ jobs:
176
173
run : sh validate.sh $FLAGS -s lib-suite
177
174
178
175
- name : Validate cli-tests
179
- if : matrix.cli != 'false'
180
176
run : sh validate.sh $FLAGS -s cli-tests
181
177
182
178
- name : Validate cli-suite
183
179
# 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')
185
181
run : sh validate.sh $FLAGS -s cli-suite
186
182
187
183
validate-old-ghcs :
0 commit comments