Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-11-19 19:42:21 -05:00
Code Issues Projects Releases Packages Wiki Activity

ci: fix ahead-check for working branch (#2120)

Browse source 
Also list remote branches during on-release
This commit is contained in:
Otto Bittner 2023-07-19 17:48:29 +02:00 • committed by GitHub
parent ac575c9a2c
commit c58d03a7b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/on-release.yml vendored
View file

@ -35,14 +35,14 @@ jobs:
PART_MINOR=${WITHOUT_V#*.} PART_MINOR=${WITHOUT_V#*.}
MAJOR_MINOR=${PART_MAJOR}.${PART_MINOR} MAJOR_MINOR=${PART_MAJOR}.${PART_MINOR}
RELEASE_BRANCH="release/v${MAJOR_MINOR}" RELEASE_BRANCH="release/v${MAJOR_MINOR}"
WORKING_BRANCH_PREFIX="tmp/${FULL_VERSION}" WORKING_BRANCH_PREFIX="origin/tmp/${FULL_VERSION}"
echo "RELEASE_BRANCH=${RELEASE_BRANCH}" | tee -a "$GITHUB_ENV" echo "RELEASE_BRANCH=${RELEASE_BRANCH}" | tee -a "$GITHUB_ENV"
echo "WORKING_BRANCH_PREFIX=${WORKING_BRANCH_PREFIX}" | tee -a "$GITHUB_ENV" echo "WORKING_BRANCH_PREFIX=${WORKING_BRANCH_PREFIX}" | tee -a "$GITHUB_ENV"
- name: Find temporary branch - name: Find temporary branch
id: find-temporary-branch id: find-temporary-branch
run: | run: |
working_branch_count=$(git branch --list "${WORKING_BRANCH_PREFIX}*" | wc -l) working_branch_count=$(git branch --list -r "${WORKING_BRANCH_PREFIX}*" | wc -l)
if [[ "${working_branch_count}" -ne 1 ]]; then if [[ "${working_branch_count}" -ne 1 ]]; then
echo "More than one (or zero) temporary branches found. Cannot finish transaction." echo "More than one (or zero) temporary branches found. Cannot finish transaction."
git branch --list "${WORKING_BRANCH_PREFIX}*" git branch --list "${WORKING_BRANCH_PREFIX}*"

2
.github/workflows/release.yml vendored
View file

@ -131,7 +131,7 @@ jobs:
git checkout "${RELEASE_BRANCH}" || exit 0 git checkout "${RELEASE_BRANCH}" || exit 0
git checkout "${WORKING_BRANCH}" git checkout "${WORKING_BRANCH}"
ahead=$(git rev-list HEAD --not "${RELEASE_BRANCH}" | wc -l) ahead=$(git rev-list HEAD --not "${RELEASE_BRANCH}" | wc -l)
if [[ "${ahead}" -gt 0 ]]; then if [[ "${ahead}" -eq 0 ]]; then
echo "The current branch is not strictly ahead of the release branch. Please rebase." echo "The current branch is not strictly ahead of the release branch. Please rebase."
exit 1 exit 1
fi fi