Skip to content

Commit

Permalink
Merge pull request #37 from coq-community/add-group
Browse files Browse the repository at this point in the history
Add missing addGroup in entrypoint.sh & Fix typo in default uninstall field
  • Loading branch information
erikmd authored Nov 28, 2020
2 parents 298d88f + da12ca1 commit 5ede7d7
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ inputs:
uninstall:
description: 'Customizable script run to uninstall the opam package(s).'
default: |
startGroup "Installation test"
startGroup "Uninstallation test"
opam remove $PACKAGE
endGroup
custom_script:
Expand Down
8 changes: 6 additions & 2 deletions entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ else
PACKAGE=$(basename "$INPUT_OPAM_FILE" .opam)
fi

startGroup Print runner configuration
startGroup "Print runner configuration"

echo "GITHUB_WORKFLOW=$GITHUB_WORKFLOW"
echo "RUNNER_OS=$RUNNER_OS"
Expand Down Expand Up @@ -119,6 +119,8 @@ if printf "%s" "$INPUT_EXPORT" | grep -e '^[a-zA-Z_][a-zA-Z0-9_ ]*$' -q -v; then
exit 1
fi

startGroup "Install perl for mustache interpolation"

apk add --no-cache perl

moperl() {
Expand All @@ -136,6 +138,8 @@ INPUT_CUSTOM_SCRIPT_EXPANDED=$(printf "%s" "$INPUT_CUSTOM_SCRIPT" | \
moperl after_script "$INPUT_AFTER_SCRIPT" | \
moperl uninstall "$INPUT_UNINSTALL")

endGroup

if test -z "$INPUT_CUSTOM_SCRIPT_EXPANDED"; then
echo "ERROR: The expanded script is empty."
usage
Expand All @@ -152,7 +156,7 @@ elif [ "$INPUT_OCAML_VERSION" = '4.07-flambda' ]; then
fi
echo OCAML407="$OCAML407"

startGroup Pull docker-coq image
startGroup "Pull docker-coq image"

echo COQ_IMAGE="$COQ_IMAGE"
docker pull "$COQ_IMAGE"
Expand Down

0 comments on commit 5ede7d7

Please sign in to comment.