chore: Remove master branch references (#2618)

Remove remaining master branch references, or replace them with main.
getsentry · Jan 17, 2023 · c6504da · c6504da
1 parent 3f1be0f
commit c6504da
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 18 deletions.
diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml
@@ -4,7 +4,6 @@ on:
     - cron: '0 0 * * *' # every night at midnight UTC
   push:
     branches:
-      - master
       - main
 
   pull_request:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,6 @@ name: Build
 on:
   push:
     branches:
-      - master
       - main
       - release/**
 
@@ -17,7 +16,7 @@ on:
       - Sentry.xcworkspace
 
 jobs:
-  # We had issues that the release build was broken on master.
+  # We had issues that the release build was broken on main.
   # With this we catch potential issues already in the PR.
   ios-swift-release:
     name: Release Build of iOS Swift
@@ -109,9 +108,9 @@ jobs:
       - name: Set SPM revision to current git commit
         run: >-
           if [[ "${{ github.event.pull_request.head.sha }}" != "" ]]; then
-            sed -i '' 's/.branch("master")/.revision("${{ github.event.pull_request.head.sha }}")/g' Samples/macOS-SPM-CommandLine/Package.swift
+            sed -i '' 's/.branch("main")/.revision("${{ github.event.pull_request.head.sha }}")/g' Samples/macOS-SPM-CommandLine/Package.swift
           else
-            sed -i '' 's/.branch("master")/.revision("${{ github.sha }}")/g' Samples/macOS-SPM-CommandLine/Package.swift
+            sed -i '' 's/.branch("main")/.revision("${{ github.sha }}")/g' Samples/macOS-SPM-CommandLine/Package.swift
           fi
         shell: bash
       - run: swift build
@@ -126,9 +125,9 @@ jobs:
       - name: Set SPM revision to current git commit
         run: >-
           if [[ "${{ github.event.pull_request.head.sha }}" != "" ]]; then
-            sed -i '' 's/.branch("master")/.revision("${{ github.event.pull_request.head.sha }}")/g' Samples/SPM-Dynamic/Package.swift
+            sed -i '' 's/.branch("main")/.revision("${{ github.event.pull_request.head.sha }}")/g' Samples/SPM-Dynamic/Package.swift
           else
-            sed -i '' 's/.branch("master")/.revision("${{ github.sha }}")/g' Samples/SPM-Dynamic/Package.swift
+            sed -i '' 's/.branch("main")/.revision("${{ github.sha }}")/g' Samples/SPM-Dynamic/Package.swift
           fi
         shell: bash
       - run: swift build

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -2,7 +2,7 @@ name: 'CodeQL'
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
   schedule:
     - cron: '40 4 * * 6'

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -2,7 +2,6 @@ name: Integration Tests
 on:
   push:
     branches:
-      - master
       - main
 
   pull_request:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -2,7 +2,6 @@ name: lint
 on:
   push:
     branches:
-      - master
       - main
     paths:
       - 'Sources/**'

diff --git a/.github/workflows/saucelabs-UI-tests.yml b/.github/workflows/saucelabs-UI-tests.yml
@@ -6,7 +6,6 @@ on:
     - cron: '0 0 * * *'
   push:
     branches:
-      - master
       - main
 
   pull_request:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,7 +2,6 @@ name: Test
 on:
   push:
     branches:
-      - master
       - main
       - release/**
 

diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml
@@ -2,7 +2,6 @@ name: Upload to Testflight
 on:
   push:
     branches:
-      - master
       - main
     paths:
       - 'Sources/**'
@@ -21,7 +20,7 @@ jobs:
       - run: ./scripts/ci-select-xcode.sh 14.0.1
       - run: bundle install
 
-      # We upload a new version to TestFlight on every commit on Master
+      # We upload a new version to TestFlight on every commit on main
       # So we need to bump the build number each time
       - name: Bump Build Version
         env:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
       - id: detect-private-key
       - id: end-of-file-fixer
       - id: no-commit-to-branch
-        args: ["-b master"]
+        args: ["-b main"]
 
   - repo: local
     hooks:

diff --git a/Samples/SPM-Dynamic/Package.swift b/Samples/SPM-Dynamic/Package.swift
@@ -11,7 +11,7 @@ let package = Package(
     ],
     dependencies: [
         // branch is replaced in CI to the current sha
-        .package(name: "Sentry", url: "https://github.com/getsentry/sentry-cocoa", .branch("master") )
+        .package(name: "Sentry", url: "https://github.com/getsentry/sentry-cocoa", .branch("main") )
     ],
     targets: [
         .target(

diff --git a/Samples/macOS-SPM-CommandLine/Package.swift b/Samples/macOS-SPM-CommandLine/Package.swift
@@ -7,7 +7,7 @@ let package = Package(
     name: "macOS-SPM-CommandLine",
     dependencies: [
         // branch is replaced in CI to the current sha
-        .package(name: "Sentry", url: "https://github.com/getsentry/sentry-cocoa", .branch("master") )
+        .package(name: "Sentry", url: "https://github.com/getsentry/sentry-cocoa", .branch("main") )
     ],
     targets: [
         .target(

diff --git a/scripts/xcode-test.sh b/scripts/xcode-test.sh
@@ -40,7 +40,7 @@ case $PLATFORM in
 esac
 
 case $REF_NAME in
-    "master")
+    "main")
         CONFIGURATION="TestCI"
         ;;
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ on: @@
         - cron: '0 0 * * *' # every night at midnight UTC
       push:
         branches:
-          - master
           - main
       pull_request:
@@ Expand Down @@