Skip to content

Always update Manifest against the base branch #115

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
tkf merged 2 commits into from
Jun 28, 2020
Merged

Always update Manifest against the base branch #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ce6d1b
Always update Manifest against the base branch
tkf Jun 28, 2020
0466ceb
(trigger)
tkf Jun 28, 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
21 changes: 12 additions & 9 deletions .github/workflows/pkg-update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,22 @@ jobs:
git ls-tree -r --name-only "origin/$target" | grep -F Manifest.toml \
| xargs git add -f --
git add .
git commit -m "Merge branch '$base'" || exit 0
git commit -m "Merge branch '$base'" || true

# Since create-pull-request does not like when the current
# branch is the target branch, checkout master.
# https://github.com/JuliaFolds/Transducers.jl/pull/167
- name: "Checkout and merge to master"
run: |
if [ "$(git rev-parse --abbrev-ref HEAD)" != "master" ]
# Since create-pull-request does not like when the current
# branch is the target branch, checkout master.
# https://github.com/JuliaFolds/Transducers.jl/pull/167
if [ "$(git rev-parse --abbrev-ref HEAD)" != "$base" ]
then
git checkout master
git merge --ff-only create-pull-request/pkg-update
git checkout "$base"
git merge --ff-only "$target"
fi

git ls-tree -r --name-only "origin/$base" | grep -F Manifest.toml \
| xargs git checkout "origin/$base" --
git ls-tree -r --name-only "origin/$base" | grep -F Manifest.toml \
| xargs git add -f --

# https://github.com/tkf/julia-update-manifests
- name: Update */Manifest.toml
uses: tkf/julia-update-manifests@v1
Expand Down