diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index b130ad494fe..1364da383d2 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -14,7 +14,7 @@ jobs: continue-on-error: true with: ref: ${{ github.event.pull_request.head.ref }} - fetch-depth: 3 + fetch-depth: 2 - name: package_json shell: bash run: | @@ -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="noreply@github.com" 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