Skip to content

Use correct branch reference for remote branches #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-tchad merged 1 commit into from
Mar 17, 2026
Merged

Use correct branch reference for remote branches #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/shellcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v6

- name: Run ShellCheck
uses: ludeeus/action-shellcheck@master
2 changes: 1 addition & 1 deletion .github/workflows/yamllint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout'
uses: actions/checkout@v3
uses: actions/checkout@v6

- name: yaml-lint
uses: ibiqlik/action-yamllint@v3
6 changes: 3 additions & 3 deletions branch-release/branch_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ esac

if [ -n "${NEXT_RELEASE:-}" ]; then
TARGET_BRANCH=release${NEXT_RELEASE}-SNAPSHOT
if git rev-parse --verify --quiet "refs/heads/${TARGET_BRANCH}"; then
if git rev-parse --verify --quiet "refs/remotes/origin/${TARGET_BRANCH}"; then
echo ""
echo "Next ESR release '${TARGET_BRANCH}' exist. Merging ${TAG} to it."
MERGE_BRANCH="${NEXT_RELEASE}_fb_bot_merge_${RELEASE_NUM}"
Expand All @@ -329,7 +329,7 @@ if [ -n "${NEXT_RELEASE:-}" ]; then
if ! git rev-parse --verify --quiet "refs/tags/${NEXT_RELEASE}.0" ; then
echo "Monthly release ${NEXT_RELEASE}.0 doesn't exist. Check for branch."
TARGET_BRANCH=release${NEXT_RELEASE}-SNAPSHOT
if git rev-parse --verify --quiet "refs/heads/${TARGET_BRANCH}"; then
if git rev-parse --verify --quiet "refs/remotes/origin/${TARGET_BRANCH}"; then
# 'SNAPSHOT' branch exists but '.0' release hasn't been created. Merge to it!
MERGE_BRANCH="${NEXT_RELEASE}_fb_bot_merge_${RELEASE_NUM}"
else
Expand All @@ -354,7 +354,7 @@ if [ -z "${MERGE_BRANCH:-}" ]; then
MERGE_BRANCH=fb_bot_merge_${RELEASE_NUM}
fi

if git rev-parse --verify --quiet "refs/heads/${MERGE_BRANCH}"; then
if git rev-parse --verify --quiet "refs/remotes/origin/${MERGE_BRANCH}"; then

RELEASE_DIFF="$(git log --cherry-pick --oneline --no-decorate "origin/${MERGE_BRANCH}..${GITHUB_SHA}" | grep -v -e '^$')"
if [ -z "${RELEASE_DIFF:-}" ]; then
Expand Down
Loading