Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove master branch references #2618

Merged
merged 1 commit into from
Jan 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/benchmarking.yml
Original file line number Diff 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
11 changes: 5 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Build
on:
push:
branches:
- master
- main
- release/**

Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'CodeQL'

on:
push:
branches: [master]
branches: [main]
pull_request:
schedule:
- cron: '40 4 * * 6'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Integration Tests
on:
push:
branches:
- master
- main

pull_request:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: lint
on:
push:
branches:
- master
- main
paths:
- 'Sources/**'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/saucelabs-UI-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ on:
- cron: '0 0 * * *'
push:
branches:
- master
- main

pull_request:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Test
on:
push:
branches:
- master
- main
- release/**

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/testflight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ name: Upload to Testflight
on:
push:
branches:
- master
- main
paths:
- 'Sources/**'
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Samples/SPM-Dynamic/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion Samples/macOS-SPM-CommandLine/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion scripts/xcode-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ case $PLATFORM in
esac

case $REF_NAME in
"master")
"main")
CONFIGURATION="TestCI"
;;

Expand Down