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.

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

Fix deploy conflicts #1250

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions scripts/ci/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ cp -R "site/" "/tmp/fl-docs"
# Copy the needed Ruby scripts to a temporary location (used for redirects)
cp "scripts/ci/available_redirects.rb" "/tmp/"
cp "scripts/ci/generate_redirects.rb" "/tmp/"
# Clean all temporary files (e.g. .bundle/config and .ruby-version)
# Clean untracked files (like temp .bundle/* or generated docs/actions*) and reset index
git clean -f -d
git reset --hard HEAD
# Check out gh-pages and clear all files
git reset --hard HEAD # we don't want the `git checkout` to cause issues (e.g. https://circleci.com/gh/fastlane/docs/730)
git fetch
git checkout gh-pages
rm -rf *
# Copy the finished HTML page to the current directory
Expand Down