Skip to content

Commit

Permalink
Don't action for now
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinvanrijn committed Oct 4, 2023
1 parent c57c50d commit 359892e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@ jobs:
sed -i -z "s/\"npm\": \"[a-zA-Z0-9+.-]*\"/\"npm\": \"$npm_version\"/2" -- package.json
sed -i "0,/\"npm\": \".*\"/s//\"npm\": \"$npm_version || $new_npm_version\"/" -- package.json
git add package.json
git status
git log -1
git -c user.name="GitHub" -c user.email="[email protected]" commit --author="github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>" -m"Fix package.json" | sed -n 1p || true
git push
git status
git log -1 --skip=2
git log -1
if [[ $(git diff --stat "$(git log -1 --skip=2 --format=%H)" "$(git log -1 --format=%H)" --) -eq 0 ]]; then
echo "automerge_pull_action=close" >> "$GITHUB_ENV"
echo "automerge_pull_action=close" # >> "$GITHUB_ENV"
else
echo "automerge_pull_action=merge" >> "$GITHUB_ENV"
echo "automerge_pull_action=merge" # >> "$GITHUB_ENV"
fi
fi
- name: automerge
Expand Down

0 comments on commit 359892e

Please sign in to comment.