Skip to content

Run deploy.sh on PRs as well #323

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

Merged
merged 3 commits into from
Jun 11, 2020
Merged

Run deploy.sh on PRs as well #323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64f5fb5
Run deploy.sh on PRs as well
foolip Jun 11, 2020
32f5004
REVERTME: introduce errors to confirm HTML checker still working
foolip Jun 11, 2020
b64b3cf
Revert "REVERTME: introduce errors to confirm HTML checker still work…
foolip Jun 11, 2020
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: 4 additions & 1 deletion .github/workflows/deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: deploy
on:
pull_request:
branches:
- master
push:
branches:
- master
- master
jobs:
deploy:
runs-on: ubuntu-20.04
Expand Down
21 changes: 8 additions & 13 deletions deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,13 @@ copy_logo "samsung-internet/samsung-internet.svg" "samsung.svg"
copy_logo "uc/uc_32x32.png" "uc.png"
echo ""

# Run the HTML checker only when building on Travis
if [[ "$TRAVIS" == "true" ]]; then
# Run the HTML checker only when building on CI
if [[ "$GITHUB_ACTIONS" == "true" ]]; then
header "Running the HTML checker..."

# Check the targets given explicitly here, plus most of the extensionless files directly inside
# whatwg.org/. This uses https://stackoverflow.com/a/23357277/3191 to get the results of the
# find command into an array. TODO: if Travis CI ever gets Bash 4.4, we can use the simpler
# version at https://stackoverflow.com/a/54561526/3191.
TARGETS=(whatwg.org/news whatwg.org/validator whatwg.org/index.html idea.whatwg.org/index.html spec.whatwg.org/index.html)
while IFS= read -r -d $'\0'; do
TARGETS+=("$REPLY")
done < <(find whatwg.org -maxdepth 1 -type f ! -name "*.*" ! -name "status-2008-12" -print0)
# Check most of the extensionless files in whatwg.org/, plus targets explicitly listed.
readarray -d '' TARGETS < <(find whatwg.org -maxdepth 1 -type f ! -name "*.*" ! -name "status-2008-12" -print0)
TARGETS+=(whatwg.org/news whatwg.org/validator whatwg.org/index.html idea.whatwg.org/index.html spec.whatwg.org/index.html)

curl --retry 2 --fail --remote-name --location https://github.com/validator/validator/releases/download/linux/vnu.linux.zip
unzip -qq vnu.linux.zip
Expand All @@ -62,13 +57,13 @@ if [[ "$TRAVIS" == "true" ]]; then
fi

# This ensures that only changes to the master branch get deployed
if [[ "$GITHUB_REF" != "refs/heads/master" ]]; then
header "Skipping deploy"
else
if [[ "$GITHUB_EVENT_NAME" == "push" && "$GITHUB_REF" == "refs/heads/master" ]]; then
header "Synchronizing content with whatwg.org et al"
eval "$(ssh-agent -s)"
echo "$SERVER_DEPLOY_KEY" | ssh-add -
mkdir -p ~/.ssh/ && echo "$SERVER $SERVER_PUBLIC_KEY" > ~/.ssh/known_hosts
rsync --verbose --archive --chmod=D755,F644 --compress --delete \
./whatwg.org ./*.whatwg.org "deploy@$SERVER:/var/www/"
else
header "Skipping deploy"
fi