diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index fcec3bb2be7..bc9e3dcf121 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - vision release: types: [published] schedule: @@ -291,7 +292,7 @@ jobs: - name: Upload master image # Only run this for pushes to master on the main repo, not forks. - if: github.repository == 'allenai/allennlp' && github.event_name == 'push' + if: github.repository == 'allenai/allennlp' && github.event_name == 'push' && github.ref == 'refs/heads/master' run: | docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} docker push $DOCKER_IMAGE_NAME @@ -422,9 +423,9 @@ jobs: EOL - name: Deploy docs - # Only run this on main repo (not forks) for commits and releases but not for - # nightly builds. - if: github.repository == 'allenai/allennlp' && github.event_name != 'schedule' + # Only run this on main repo (not forks) master branch for commits and releases, + # but not for nightly builds. + if: github.repository == 'allenai/allennlp' && github.event_name != 'schedule' && github.ref == 'refs/heads/master' run: | # And push them up to GitHub cd ~/allennlp-docs/ diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 989df682df5..3967b93496f 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -23,7 +23,7 @@ jobs: run: | # If this step fails, this means you haven't updated the CHANGELOG.md # file with notes on your contribution. - git diff --name-only $(git merge-base origin/master HEAD) | grep '^CHANGELOG.md$' && echo "Thanks for helping keep our CHANGELOG up-to-date!" + git diff --name-only $(git merge-base origin/${{ github.base_ref }} HEAD) | grep '^CHANGELOG.md$' && echo "Thanks for helping keep our CHANGELOG up-to-date!" gpu_checks: name: GPU Checks