diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c8faecfcb..4ed85ee69 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -1,6 +1,6 @@ name: CI on: - push: { branches: [master] } + push: { branches: [main] } pull_request: concurrency: diff --git a/PUBLISHING.md b/PUBLISHING.md index 3df682ab0..c52191064 100644 --- a/PUBLISHING.md +++ b/PUBLISHING.md @@ -5,7 +5,7 @@ It's not great, but it works for now. PRs to improve this process would be greatly appreciated! 1. Make sure you've got a clean working tree and it's updated with the latest - changes on `master` + changes on `main` 2. Edit `Cargo.toml` to bump the version number 3. Commit this change 4. Run `git tag` to create a tag for this version diff --git a/ci/bench-icount.sh b/ci/bench-icount.sh index 12228b9da..64405fdd0 100755 --- a/ci/bench-icount.sh +++ b/ci/bench-icount.sh @@ -15,7 +15,7 @@ iai_home="iai-home" # Use the arch as a tag to disambiguate artifacts tag="$(echo "$target" | cut -d'-' -f1)" -# Download the baseline from master +# Download the baseline from main ./ci/ci-util.py locate-baseline --download --extract --tag "$tag" # Run benchmarks once diff --git a/ci/ci-util.py b/ci/ci-util.py index c1db17c6c..cb582db35 100755 --- a/ci/ci-util.py +++ b/ci/ci-util.py @@ -49,7 +49,7 @@ REPO_ROOT = Path(__file__).parent.parent GIT = ["git", "-C", REPO_ROOT] -DEFAULT_BRANCH = "master" +DEFAULT_BRANCH = "main" WORKFLOW_NAME = "CI" # Workflow that generates the benchmark artifacts ARTIFACT_PREFIX = "baseline-icount*" @@ -186,7 +186,7 @@ def __init__(self) -> None: def _init_change_list(self): """Create a list of files that have been changed. This uses GITHUB_REF if - available, otherwise a diff between `HEAD` and `master`. + available, otherwise a diff between `HEAD` and `main`. """ # For pull requests, GitHub creates a ref `refs/pull/1234/merge` (1234 being