diff --git a/.github/pre-push b/.github/pre-push index ecb23a9..039e093 100755 --- a/.github/pre-push +++ b/.github/pre-push @@ -2,7 +2,7 @@ set -e IFS=' ' while read local_ref _local_sha _remote_ref _remote_sha; do - remote_main=$( (git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null || echo "///master") | cut -f 4 -d / | tr -d "[:space:]") + remote_main=$( (git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null || echo "///main") | cut -f 4 -d / | tr -d "[:space:]") local_ref_short=$(echo "$local_ref" | cut -f 3 -d / | tr -d "[:space:]") if [ "$local_ref_short" = "$remote_main" ]; then make lint diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2b62853..17474fa 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,11 +3,10 @@ name: Tests on: push: branches: - - master - - stevearc-* + - main pull_request: branches: - - master + - main jobs: luacheck: @@ -86,7 +85,7 @@ jobs: python -m pip install pyparsing==3.0.9 make doc - name: Commit changes - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/main' }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} COMMIT_MSG: | @@ -103,7 +102,7 @@ jobs: release: name: release - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/main' }} needs: - luacheck - stylua