Skip to content
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI
on:
push: { branches: [master] }
push: { branches: [main] }
pull_request:

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion PUBLISHING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/bench-icount.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ci/ci-util.py
Original file line number Diff line number Diff line change
Expand Up @@ -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*"

Expand Down Expand Up @@ -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
Expand Down
Loading