From 6ffaea7e4ce737908ed69790922454b6e2c9ceda Mon Sep 17 00:00:00 2001 From: m1yag1 <8730430+m1yag1@users.noreply.github.com> Date: Sun, 13 Jul 2025 22:49:24 -0500 Subject: [PATCH] Update default branch references from master to main - Update GitHub Actions sentry deployment condition - Update Platform.sh production environment checks - Prepare for default branch rename --- .github/workflows/config.yml | 2 +- pyslackersweb/settings.py | 2 +- pyslackersweb/sirbot/settings.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 510ec1e1..7de4e10e 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -69,7 +69,7 @@ jobs: if-no-files-found: warn sentry: - if: ${{ github.ref == 'refs/heads/master' }} + if: ${{ github.ref == 'refs/heads/main' }} runs-on: ubuntu-latest env: SENTRY_ORG: pyslackers diff --git a/pyslackersweb/settings.py b/pyslackersweb/settings.py index 37492e44..dd3a3446 100644 --- a/pyslackersweb/settings.py +++ b/pyslackersweb/settings.py @@ -13,7 +13,7 @@ SENTRY_RELEASE = os.getenv("PLATFORM_TREE_ID") -IS_PRODUCTION = os.getenv("PLATFORM_BRANCH") == "master" +IS_PRODUCTION = os.getenv("PLATFORM_BRANCH") == "main" # This must be an admin user's token on the team SLACK_INVITE_TOKEN = os.getenv("SLACK_INVITE_TOKEN", os.getenv("SLACK_OAUTH_TOKEN")) diff --git a/pyslackersweb/sirbot/settings.py b/pyslackersweb/sirbot/settings.py index 9804201a..1c8d9bf2 100644 --- a/pyslackersweb/sirbot/settings.py +++ b/pyslackersweb/sirbot/settings.py @@ -4,5 +4,5 @@ READTHEDOCS_NOTIFICATION_CHANNEL = "community_projects" # Development -if os.environ.get("PLATFORM_BRANCH") != "master": +if os.environ.get("PLATFORM_BRANCH") != "main": READTHEDOCS_NOTIFICATION_CHANNEL = "general"