Rename trunk -> main
MODIFY
.github/workflows/release.yml
.github/workflows/release.yml
@@ -12,7 +12,7 @@ env:
PREFIX_FOR_TEST: ${{ github.event.client_payload.test_prefix }}
jobs:
- bump-trunk:
+ bump-main:
runs-on: macos-latest
steps:
@@ -25,16 +25,16 @@ jobs:
- name: Checkout
uses: actions/checkout@v2
- - name: Checkout Trunk
+ - name: Checkout Main
uses: actions/checkout@v2
with:
- ref: ${{ env.PREFIX_FOR_TEST }}trunk
- path: trunk
+ ref: ${{ env.PREFIX_FOR_TEST }}main
+ path: main
- name: Setup Release Branch (major, minor)
if: env.RELEASE_TYPE == 'major' || env.RELEASE_TYPE == 'minor'
run: |
- cp -R trunk release
+ cp -R main release
cd release
git checkout -b ${{ env.RELEASE_BRANCH }}
@@ -47,23 +47,23 @@ jobs:
- name: Update Changelog
run: |
- cd trunk
+ cd main
../.buildscript/update_changelog.swift
cd ../release
../.buildscript/update_changelog.swift
- - name: Update Trunk Version (major, minor)
+ - name: Update Main Version (major, minor)
if: env.RELEASE_TYPE == 'major' || env.RELEASE_TYPE == 'minor'
run: |
- cd trunk
+ cd main
ls Workflow*.podspec | xargs sed -i '' -e "s/ s.version\( *=\).*/ s.version\1 '${{ env.WORKFLOW_VERSION }}'/"
- - name: Push changes to trunk
+ - name: Push changes to main
env:
GIT_USERNAME: ${{ github.actor }}
GIT_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
run: |
- cd trunk
+ cd main
git add -A . && git commit -m "Releasing ${{ env.WORKFLOW_VERSION }}" && git push -f
- name: Push Release Branch

MODIFY
.github/workflows/swift.yaml
.github/workflows/swift.yaml
@@ -3,7 +3,7 @@ name: Swift CI
on:
push:
branches:
- - trunk
+ - main
paths:
- '*.podspec'
- 'Gemfile*'

MODIFY
RELEASING.md
RELEASING.md
@@ -13,7 +13,7 @@ and assign it to @bencochran or @aquageek.*
---
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. Create a commit and tag the commit with the version number:
```bash
@@ -38,7 +38,7 @@ and assign it to @bencochran or @aquageek.*
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
```
@@ -53,16 +53,16 @@ and assign it to @bencochran or @aquageek.*
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

Rename trunk -> main