Skip to content

HDDS-15922. Fix ozone-site config doc workflow reusing stale PR branch #10826

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

Open
sravani-revuri wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −13
Open

HDDS-15922. Fix ozone-site config doc workflow reusing stale PR branch #10826

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
19 changes: 6 additions & 13 deletions .github/workflows/update-ozone-site-config-doc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,8 @@ jobs:
git config --global user.email 'github-actions[bot]@users.noreply.github.com'

git clone --depth=1 --branch=master https://github.com/$REPO_OWNER/ozone-site.git ozone-site

# Check if $BRANCH_NAME branch exists remotely
cd ozone-site
if git ls-remote --heads origin $BRANCH_NAME | grep -q $BRANCH_NAME; then
echo "PR branch exists, checking it out for comparison"
git fetch --depth=1 origin $BRANCH_NAME
git checkout -B $BRANCH_NAME FETCH_HEAD
else
echo "PR branch does not exist, staying on master for comparison"
fi
echo "Using master as baseline for doc comparison and PR branch creation"

- name: Check if documentation changed
if: steps.check-site-repo.outputs.exists == 'true'
Expand Down Expand Up @@ -131,12 +123,13 @@ jobs:
run: |
cd ozone-site

echo "Current branch: $(git branch --show-current)"
echo "Current commit: $(git rev-parse HEAD)"
echo "Baseline branch: master"
echo "Baseline commit: $(git rev-parse master)"

# Create/reset branch at current commit
# Always recreate the PR branch from master so merged changes are not replayed.
git checkout master
git checkout -B "$BRANCH_NAME"
echo "Created/reset branch $BRANCH_NAME at current commit"
echo "Created branch $BRANCH_NAME from master"

git add "$TARGET_FILE"

Expand Down