diff --git a/.github/workflows/autoblack_push.yml b/.github/workflows/autoblack_push.yml deleted file mode 100644 index 3aa0393..0000000 --- a/.github/workflows/autoblack_push.yml +++ /dev/null @@ -1,26 +0,0 @@ -# GitHub Action that uses Black to reformat Python code (if needed) when doing a git push. -# If all Python code in the repo is complient with Black then this Action does nothing. -# Otherwise, Black is run and its changes are committed to the repo. -# https://github.com/cclauss/autoblack - -name: autoblack_push -on: [push] -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: # https://github.com/stefanzweifel/git-auto-commit-action#checkout-the-correct-branch - ref: ${{ github.head_ref }} - - uses: actions/setup-python@v1 - - run: pip install black - - run: black --check . - - name: If needed, commit black changes to a new pull request - if: failure() - run: | - black . - git config --global user.name github-actions - git config --global user.email '${GITHUB_ACTOR}@users.noreply.github.com' - # git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY - git commit -am "fixup! Format Python code with psf/black push" - git push # --force origin HEAD:$GITHUB_REF diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b708504..59a5e24 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,6 +5,24 @@ on: - main jobs: build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: # https://github.com/stefanzweifel/git-auto-commit-action#checkout-the-correct-branch + ref: ${{ github.head_ref }} + - uses: actions/setup-python@v1 + - run: pip install black + - run: black --check . + - name: If needed, commit black changes to a new pull request + if: failure() + run: | + black . + git config --global user.name github-actions + git config --global user.email '${GITHUB_ACTOR}@users.noreply.github.com' + # git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY + git commit -am "Format Python code with psf/black push" + git push origin main + deploy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2