Skip to content

Rename trunk branch to main. #11

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 16, 2020
Merged

Rename trunk branch to main. #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .buildscript/deploy_snapshot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

SLUG="square/workflow"
JDK="oraclejdk8"
BRANCH="trunk"
BRANCH="main"

set -e

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kotlin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Kotlin CI
on:
push:
branches:
- trunk
- main
pull_request:

env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# workflow

[![Kotlin CI](https://github.com/square/workflow-kotlin/workflows/Kotlin%20CI/badge.svg)](https://github.com/square/workflow-kotlin/actions?query=branch%3Atrunk)
[![Kotlin CI](https://github.com/square/workflow-kotlin/workflows/Kotlin%20CI/badge.svg)](https://github.com/square/workflow-kotlin/actions?query=branch%3Amain)
[![Maven Central](https://img.shields.io/maven-central/v/com.squareup.workflow/workflow-core-jvm.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.squareup.workflow%22)
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](https://www.apache.org/licenses/LICENSE-2.0)
[![Kotlinlang slack](https://img.shields.io/static/v1?label=kotlinlang&message=squarelibraries&color=brightgreen&logo=slack)](https://kotlinlang.slack.com/archives/C5HT9AL7Q)
Expand Down
14 changes: 7 additions & 7 deletions RELEASING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
---
1. Merge an update of [the change log](CHANGELOG.md) with the changes since the last release.

1. Make sure you're on the `trunk` branch (or fix branch, e.g. `v0.1-fixes`).
1. Make sure you're on the `main` branch (or fix branch, e.g. `v0.1-fixes`).

1. Confirm that the kotlin build is green before committing any changes
```bash
Expand Down Expand Up @@ -42,7 +42,7 @@

1. Push your commits and tag:
```
git push origin trunk
git push origin main
# or git push origin fix-branch
git push origin v0.1.0
```
Expand All @@ -57,16 +57,16 @@
1. If this is a pre-release version, check the pre-release box.
1. Hit "Publish release".

1. If this was a fix release, merge changes to the trunk branch:
1. If this was a fix release, merge changes to the main branch:
```bash
git checkout trunk
git checkout main
git pull
git merge --no-ff v0.1-fixes
# Resolve conflicts. Accept trunk's versions of gradle.properties and podspecs.
git push origin trunk
# Resolve conflicts. Accept main's versions of gradle.properties and podspecs.
git push origin main
```

1. Publish the website. See https://github.com/square/workflow/blob/trunk/RELEASING.md.
1. Publish the website. See https://github.com/square/workflow/blob/main/RELEASING.md.

### Validating Markdown

Expand Down