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

chore: merge latest changes when asserting changes #22539

Merged
merged 10 commits into from
Mar 25, 2020
Merged

chore: merge latest changes when asserting changes #22539

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
287fd63
chore: merge latest changes when asserting changes
wardpeet Mar 24, 2020
5204450
remove dumb me
wardpeet Mar 24, 2020
397590c
fix credentials
wardpeet Mar 24, 2020
ec35260
remove git config values
wardpeet Mar 24, 2020
4bc98f7
move things around for local testing
wardpeet Mar 24, 2020
443cfe5
test global config
wardpeet Mar 24, 2020
146769c
test
wardpeet Mar 24, 2020
53f58a9
test2
wardpeet Mar 24, 2020
ef8b2f5
skip ssh, use https
wardpeet Mar 24, 2020
73112d7
always reset
wardpeet Mar 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 24 additions & 0 deletions scripts/assert-changed-files.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,35 @@
#!/bin/bash

IS_CI="${CI:-false}"
GREP_PATTERN=$1

if [ "$IS_CI" = true ]; then
git config --local url."https://github.com/".insteadOf git@github.com:
git config --local user.name "GatsbyJS Bot"
git config --local user.email "core-team@gatsbyjs.com"

git fetch origin
git merge --no-edit origin/master

if [ $? -ne 0 ]; then
echo "Branch has conflicts with master, rolling back test."
git merge --abort
fi

git config --local --unset user.name
git config --local --unset user.email
git config --local --unset url."https://github.com/".insteadOf
fi

FILES_COUNT="$(git diff-tree --no-commit-id --name-only -r "$CIRCLE_BRANCH" origin/master | grep -E "$GREP_PATTERN" -c)"

# reset to previous state
git reset --hard HEAD@{1}

if [ "$FILES_COUNT" -eq 0 ]; then
echo "0 files matching '$GREP_PATTERN'; exiting and marking successful."
circleci step halt || exit 1
else
echo "$FILES_COUNT file(s) matching '$GREP_PATTERN'; continuing."
fi