From 6284c20b2ee0f3b2910ca44b84d4d3add8c565e1 Mon Sep 17 00:00:00 2001 From: "Travis F. Collins" Date: Thu, 26 Oct 2023 09:35:24 -0600 Subject: [PATCH] Switch primary branch to main instead of master Signed-off-by: Travis F. Collins --- .github/workflows/test-pypi.yml | 2 +- .github/workflows/test.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test-pypi.yml b/.github/workflows/test-pypi.yml index 4e1e65554..3ea29c47b 100644 --- a/.github/workflows/test-pypi.yml +++ b/.github/workflows/test-pypi.yml @@ -2,7 +2,7 @@ name: TestPyPI on: push: branches: - - master + - main jobs: DeployTestPyPI: runs-on: ubuntu-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ebf461b0..0e7233e14 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -118,10 +118,10 @@ jobs: cd doc && make html cd .. - DeployMasterDoc: + DeployMainDoc: runs-on: ubuntu-latest needs: [Test,Lint,Doc] - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@v2 @@ -147,13 +147,13 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} publish_dir: ./doc/build/html - destination_dir: master + destination_dir: main DeployDevelopmentDoc: runs-on: ubuntu-latest needs: [Test,Lint,Doc] - # Only run on pull requests to master and non-forks - if: github.event_name == 'pull_request' && github.base_ref == 'master' && ! github.event.pull_request.head.repo.fork + # Only run on pull requests to main and non-forks + if: github.event_name == 'pull_request' && github.base_ref == 'main' && ! github.event.pull_request.head.repo.fork steps: - uses: actions/checkout@v2 - name: Set up Python 3.7