Skip to content

Commit 95a0967

Browse files
Fix SUBDIR handling in CI
1 parent e6239ed commit 95a0967

1 file changed

Lines changed: 13 additions & 6 deletions

File tree

.github/workflows/build.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,21 +363,22 @@ jobs:
363363
chmod +x $1
364364
fi
365365
}
366+
if test -n "$SUBDIR"; then
367+
cd "$SUBDIR"
368+
fi
366369
download_one packcheck.sh
367370
368371
# Store the function in a file so that it can be reused across multiple
369372
# steps.
370373
- name: Setup packcheck
371374
shell: bash
372375
run: |
376+
if test -n "$SUBDIR"; then
377+
rm -f cabal.project
378+
cd "$SUBDIR"
379+
fi
373380
cat << 'EOF' > packcheck-setup.sh
374381
setup_packcheck_args() {
375-
if test -n "$SUBDIR"; then
376-
mv packcheck.sh "$SUBDIR/"
377-
rm -f cabal.project
378-
cd "$SUBDIR"
379-
fi
380-
381382
ARGS="${{ matrix.command }} $COMMON_OPTIONS"
382383
if test "${{ matrix.command }}" = "cabal"; then
383384
ARGS="$ARGS $CABAL_OPTIONS"
@@ -418,6 +419,9 @@ jobs:
418419
(runner.os == 'Windows' && steps.restore-deps-win.outputs.cache-hit != 'true')
419420
shell: bash
420421
run: |
422+
if test -n "$SUBDIR"; then
423+
cd "$SUBDIR"
424+
fi
421425
source packcheck-setup.sh
422426
setup_packcheck_args
423427
eval "./packcheck.sh $ARGS BUILD_DEPS_ONLY=y"
@@ -472,6 +476,9 @@ jobs:
472476
- name: Run packcheck (final build)
473477
shell: bash
474478
run: |
479+
if test -n "$SUBDIR"; then
480+
cd "$SUBDIR"
481+
fi
475482
source packcheck-setup.sh
476483
setup_packcheck_args
477484
eval "./packcheck.sh $ARGS BUILD_PACKAGE_ONLY=y"

0 commit comments

Comments
 (0)