Skip to content

Commit

Permalink
default repository renamed master -> main
Browse files Browse the repository at this point in the history
  • Loading branch information
himorin committed Feb 5, 2021
1 parent f8cc329 commit e7251c1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.com/w3c/ttml2.svg?branch=master)](https://travis-ci.com/w3c/ttml2)
[![Build Status](https://travis-ci.com/w3c/ttml2.svg?branch=main)](https://travis-ci.com/w3c/ttml2)

# Timed Text Markup Language 2 (TTML2) Specification

Expand Down
12 changes: 6 additions & 6 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ echo "[TRACE] TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST"
SOURCE_BRANCH="$TRAVIS_PULL_REQUEST_BRANCH"
TARGET_BRANCH="$TRAVIS_PULL_REQUEST_BRANCH-build"

if [ "$TRAVIS_PULL_REQUEST" != "false" -a "$TRAVIS_PULL_REQUEST_BRANCH" = "master" ]; then
echo "[ERROR] We're in a pull request but we're in the master branch?!?!"
if [ "$TRAVIS_PULL_REQUEST" != "false" -a "$TRAVIS_PULL_REQUEST_BRANCH" = "main" ]; then
echo "[ERROR] We're in a pull request but we're in the main branch?!?!"
echo " This shouldn't happen..."
exit 1
fi

if [ "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_BRANCH" = "master" ]; then
SOURCE_BRANCH="master"
if [ "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_BRANCH" = "main" ]; then
SOURCE_BRANCH="main"
TARGET_BRANCH="gh-pages"
fi

if [ "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_BRANCH" != "master" ]; then
echo "[ABORT] We're in a push build (not in master nor in a pull request), so exiting. "
if [ "$TRAVIS_PULL_REQUEST" = "false" -a "$TRAVIS_BRANCH" != "main" ]; then
echo "[ABORT] We're in a push build (not in main nor in a pull request), so exiting. "
exit 0
fi

Expand Down
2 changes: 1 addition & 1 deletion spec/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ To build TTML2 spec, you need to have Apache ant installed.

## Using github

1. Checkout an up to date branch (e.g. `master`).
1. Checkout an up to date branch (e.g. `main`).
3. Edit `ttml.xml`
4. `ant build` - the build artefacts are stored in the `/spec/build` directory, e.g. `index.html` is the TTML2 HTML specification.
5. If more edits, go to 3.
Expand Down

0 comments on commit e7251c1

Please sign in to comment.