Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fetch latest commits in make setup-charon #312

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Fetch latest commits in make setup-charon #312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/check-charon-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ cd charon
ACTUAL_COMMIT="$(git rev-parse HEAD)"
if [[ "$CHARON_IS_SYMLINK" != "1" && "$ACTUAL_COMMIT" != "$PINNED_COMMIT" ]]; then
if [[ "$FORCE" == "1" ]]; then
git checkout "$PINNED_COMMIT" && rebuild
git fetch origin && git checkout "$PINNED_COMMIT" && rebuild
exit 0
else
echo 'Error: `charon` commit is not the pinned commit. Update the charon repository to the commit specified in `./charon-pin`:'
echo ' $ cd charon && git checkout '"$PINNED_COMMIT"' && make test'
echo ' $ cd charon && git fetch origin && git checkout '"$PINNED_COMMIT"' && make test'
echo 'To do this automatically, run `make setup-charon`.'
exit 1
fi
Expand Down
Loading