Skip to content

Commit

Permalink
Merge branch 'feature/linting' of github.com:digicatapult/act-pot-che…
Browse files Browse the repository at this point in the history
…ribsd into feature/linting

* 'feature/linting' of github.com:digicatapult/act-pot-cheribsd:
  Apply suggestions from code review
  • Loading branch information
dblane-digicatapult committed Mar 21, 2024
2 parents 2c2987c + 2cbe8a8 commit 0d50356
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ if [ "$1" != '--url' ] || [ "$3" != '--token' ]; then
fi

# Generate a random string for the runner name, if using config.sh without variables
export RANDOM
RANDOM="$(LC_ALL=C tr -dc 'a-zA-Z0-9' < /dev/urandom | head -c 8)"
export RANDOM
. ${SCRIPTDIR}/check-envs.sh

mkdir -p ${RUNNER_CONFIG_DIRECTORY}
Expand Down
2 changes: 1 addition & 1 deletion flavours/github-act.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if [ "$NAME" = "FreeBSD" ]; then
echo "FreeBSD update completed."
fi

if [ "$NAME" = "FreeBSD" ] || [ "$NAME" = "CheriBSD" ]; then
if [ "$NAME" = "CheriBSD" ]; then
echo "skipped freebsd-update for $NAME"
fi

Expand Down

0 comments on commit 0d50356

Please sign in to comment.