Skip to content

Commit

Permalink
ci: fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
misumisumi committed Sep 30, 2024
1 parent bbcde1c commit d341a39
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/merge-upstream-and-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
sed -i -e "s/ayamir\/nvimdots/misumisumi\/nvimdots/g" ./scripts/install_my_repo.sh
./scripts/install_my_repo.sh
nvim --headless "+Lazy! update" +qa
cp -pv "${HOME}/.config/nvim/lazy-lock.json" .
cp -pv "${HOME}/.config/nvim/lazy-lock.json" lazy-lock.new.json
curl -L https://raw.githubusercontent.com/ayamir/nvimdots/main/lazy-lock.json -o lazy-lock.upstream.json
# refer to the upstream lazy-lock.json and merge common plugins with priority given to the upstream version.
jq -s '
Expand All @@ -67,9 +67,8 @@ jobs:
else
{($k): .value}
end)
| add' lazy-lock.json lazy-lock.upstream.json > lazy-lock.tmp.json
mv lazy-lock.tmp.json lazy-lock.json
rm lazy-lock.upstream.json
| add' lazy-lock.new.json lazy-lock.upstream.json > lazy-lock.json
rm lazy-lock.upstream.json lazy-lock.new.json
- uses: stefanzweifel/git-auto-commit-action@v5
if: steps.check_lockfile.outputs.files_exists == 'true' || contains(fromJSON('["success", "skipped"]'), steps.fix-conflict.outcome)
Expand Down

0 comments on commit d341a39

Please sign in to comment.