Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Timo Ley
synapse
Commits
bb98c593
Unverified
Commit
bb98c593
authored
3 years ago
by
Richard van der Hoff
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Prepare for rename of default complement branch (#11971)
use `HEAD` rather than hardcoding `master`
parent
0171fa52
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.github/workflows/tests.yml
+3
-3
3 additions, 3 deletions
.github/workflows/tests.yml
changelog.d/11971.misc
+1
-0
1 addition, 0 deletions
changelog.d/11971.misc
with
4 additions
and
3 deletions
.github/workflows/tests.yml
+
3
−
3
View file @
bb98c593
...
@@ -345,7 +345,7 @@ jobs:
...
@@ -345,7 +345,7 @@ jobs:
path
:
synapse
path
:
synapse
# Attempt to check out the same branch of Complement as the PR. If it
# Attempt to check out the same branch of Complement as the PR. If it
# doesn't exist, fallback to
master
.
# doesn't exist, fallback to
HEAD
.
-
name
:
Checkout complement
-
name
:
Checkout complement
shell
:
bash
shell
:
bash
run
:
|
run
:
|
...
@@ -358,8 +358,8 @@ jobs:
...
@@ -358,8 +358,8 @@ jobs:
# for pull requests, otherwise GITHUB_REF).
# for pull requests, otherwise GITHUB_REF).
# 2. Attempt to use the base branch, e.g. when merging into release-vX.Y
# 2. Attempt to use the base branch, e.g. when merging into release-vX.Y
# (GITHUB_BASE_REF for pull requests).
# (GITHUB_BASE_REF for pull requests).
# 3. Use the default complement branch ("
master
").
# 3. Use the default complement branch ("
HEAD
").
for BRANCH_NAME in "$GITHUB_HEAD_REF" "$GITHUB_BASE_REF" "${GITHUB_REF#refs/heads/}" "
master
"; do
for BRANCH_NAME in "$GITHUB_HEAD_REF" "$GITHUB_BASE_REF" "${GITHUB_REF#refs/heads/}" "
HEAD
"; do
# Skip empty branch names and merge commits.
# Skip empty branch names and merge commits.
if [[ -z "$BRANCH_NAME" || $BRANCH_NAME =~ ^refs/pull/.* ]]; then
if [[ -z "$BRANCH_NAME" || $BRANCH_NAME =~ ^refs/pull/.* ]]; then
continue
continue
...
...
This diff is collapsed.
Click to expand it.
changelog.d/11971.misc
0 → 100644
+
1
−
0
View file @
bb98c593
Prepare for rename of default complement branch.
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment