Skip to content

chore: backporting changes to merge-forward job from v2 branch #12482

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
mergify merged 1 commit into from
Jan 13, 2021
Merged

chore: backporting changes to merge-forward job from v2 branch #12482

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
9 changes: 6 additions & 3 deletions scripts/merge-forward.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ set -exo pipefail
git fetch --all
git checkout -B v2-main origin/v2-main

git merge origin/master --no-edit

# Some package rules differ between v1 and v2, most notably which packages can be public vs private.
# These differences are fixable via 'pkglint', so we run that and commit the delta (if any).
lerna run pkglint && { git diff --quiet || git commit -am 'automatic pkglint fixes'; }

git merge origin/master --no-edit
yarn install --frozen-lockfile
yarn pkglint
# Commit the difference, if there is one.
git diff --quiet || git commit -am 'automatic pkglint fixes'