diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 53f291c6..f87fc89f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -3,11 +3,11 @@ name: Py 3.10, 3.11, 3.12 | Windows Mac Linux on: push: branches: - - master + - main - develop pull_request: branches: - - master + - main - develop jobs: @@ -44,7 +44,7 @@ jobs: - id: hindcast-logic run: | - if [[ "${{ github.event.pull_request.base.ref }}" == "master" || "${{ steps.changes.outputs.wave_io_hindcast }}" == "true" ]]; then + if [[ "${{ github.event.pull_request.base.ref }}" == "main" || "${{ steps.changes.outputs.wave_io_hindcast }}" == "true" ]]; then echo "should-run-hindcast=true" >> "$GITHUB_OUTPUT" else echo "should-run-hindcast=false" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 239b3fa1..ed41bb00 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -1,4 +1,4 @@ -# Builds mhkit and publishes to testpypi.org on every commit to master. On tagged commits, also publishes to pypi.org. +# Builds mhkit and publishes to testpypi.org on every commit to main. On tagged commits, also publishes to pypi.org. # https://packaging.python.org/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows/ name: Build and release 🐍 📦 @@ -6,7 +6,7 @@ name: Build and release 🐍 📦 on: push: branches: - - master + - main release: types: [published] diff --git a/README.md b/README.md index 4a6f5c3d..2c00db8e 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ - - + + @@ -82,7 +82,7 @@ The GitHub platform has the branch feature that facilitates code contributions a 1. Navigate to your fork of MHKiT-Python (see instructions above) 2. Above the list of files, click **Branches**. 3. Click **New Branch**. -4. Enter a name for the branch. Be sure to select **MHKiT-Software/MHKiT-Python:master** as the source. +4. Enter a name for the branch. Be sure to select **MHKiT-Software/MHKiT-Python:main** as the source. 5. Click **Create branch**. You will now have a branch on your fork of MHKiT-Python that you can use to work with the code base. ## Creating a pull request