Skip to content

Commit

Permalink
chore(ci): use develop as default branch
Browse files Browse the repository at this point in the history
  • Loading branch information
metachris committed Jul 3, 2024
1 parent 2507fd8 commit 69e22b6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/bench.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
pull_request:
push:
branches: [main]
branches: [develop]

jobs:
bench:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
# S3 upload directory, depending if it includes a comparison or not
if [ "$HEAD_SHA" == "$BASE_SHA" ]; then
# No comparison (i.e. running on a branch like main directly)
# No comparison (i.e. running on a branch like develop directly)
S3_UPLOAD_DIR="benchmark/${HEAD_SHA_SHORT}"
else
# Comparison (i.e. running on a PR)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
pull_request:
merge_group:
push:
branches: [main]
branches: [develop]

env:
CARGO_TERM_COLOR: always
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/env-vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if [ -z "$HEAD_BRANCH" ]; then
fi

# BASE_REF and BASE_SHA are the baseline (what the PR is pointing to, and what Criterion can compoare).
export BASE_REF=${GITHUB_BASE_REF:=main} # main branch by default
export BASE_REF=${GITHUB_BASE_REF:=develop} # "develop" branch is the default
export BASE_SHA=$( git log -n 1 --pretty=format:"%H" origin/${BASE_REF} ) # get hash of base branch
export BASE_SHA_SHORT=$( echo $BASE_SHA | cut -c1-7 )

Expand Down

0 comments on commit 69e22b6

Please sign in to comment.