From 6ce6d1b989e176ca96ed613be9393bae8adb01ce Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 28 Jun 2020 01:55:34 -0700 Subject: [PATCH 1/2] Always update Manifest against the base branch --- .github/workflows/pkg-update.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/pkg-update.yml b/.github/workflows/pkg-update.yml index 1f6ecb69..cc7235bc 100644 --- a/.github/workflows/pkg-update.yml +++ b/.github/workflows/pkg-update.yml @@ -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 From 0466cebed5b2898fc9dd263cf005dc134c5f1ed0 Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sun, 28 Jun 2020 02:31:11 -0700 Subject: [PATCH 2/2] (trigger)