Skip to content

Commit 7206b88

Browse files
committed
fix(ci): correct cache path mismatch between stage-and-check and deploy jobs
- Standardize cache staging directory from 'deploy-staging/' to 'stage/' - Ensures cache save and restore paths match - Fixes 'fail-on-cache-miss: true' cache miss error - Updates all references in organize, cache, and validation steps Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
1 parent 14379d7 commit 7206b88

1 file changed

Lines changed: 12 additions & 9 deletions

File tree

.github/workflows/sphinxbuild.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ jobs:
326326
branch="${{ steps.branch.outputs.branch_name }}"
327327
328328
# Create the branch folder directly
329-
mkdir -p "deploy-staging/${branch}"
329+
mkdir -p "stage/${branch}"
330330
331331
# Copy artifacts preserving their manual folder structure
332332
# Each artifact (user_manual, admin_manual, developer_manual) contains
@@ -335,20 +335,20 @@ jobs:
335335
if [ -d "$artifact" ]; then
336336
manual_name="$(basename "$artifact")"
337337
# Create the manual-specific folder
338-
mkdir -p "deploy-staging/${branch}/${manual_name}"
338+
mkdir -p "stage/${branch}/${manual_name}"
339339
# Copy artifact contents into the manual folder
340-
cp -r "$artifact/"* "deploy-staging/${branch}/${manual_name}/"
340+
cp -r "$artifact/"* "stage/${branch}/${manual_name}/"
341341
fi
342342
done
343343
344344
# Move PDF files to the root of the branch folder for cleaner structure
345-
find "deploy-staging/${branch}/" -maxdepth 2 -name "*.pdf" -type f -exec mv {} "deploy-staging/${branch}/" \;
345+
find "stage/${branch}/" -maxdepth 2 -name "*.pdf" -type f -exec mv {} "stage/${branch}/" \;
346346
347347
# Clean up empty directories
348-
find deploy-staging -type d -empty -delete
348+
find stage -type d -empty -delete
349349
350350
echo "Staged artifacts for ${branch}:"
351-
find deploy-staging -type f | head -20
351+
find stage -type f | head -20
352352
353353
# ========================================================================
354354
# CACHE STAGING ARTIFACTS
@@ -359,7 +359,7 @@ jobs:
359359
- name: Cache staged artifacts
360360
uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
361361
with:
362-
path: deploy-staging/
362+
path: stage/
363363
key: staged-docs-${{ github.sha }}
364364

365365
# ========================================================================
@@ -381,7 +381,7 @@ jobs:
381381
382382
# Merge in the new artifacts
383383
mkdir -p "full-context/server/${branch}"
384-
cp -r "deploy-staging/${branch}/"* "full-context/server/${branch}/" || true
384+
cp -r "stage/${branch}/"* "full-context/server/${branch}/" || true
385385
386386
echo "Validation structure ready:"
387387
find full-context -type d -maxdepth 2
@@ -398,7 +398,6 @@ jobs:
398398
--no-progress
399399
--remap 'https://docs.nextcloud.com/server/ file://$(pwd)/full-context/server/'
400400
--exclude 'mailto:'
401-
--exclude '(https?:/?/?)?$'
402401
--exclude-path '.*/404\.html'
403402
'full-context/server/${{ steps.branch.outputs.branch_name }}/**/*.html'
404403
@@ -499,6 +498,10 @@ jobs:
499498
echo "has_changes=true" >> $GITHUB_OUTPUT
500499
fi
501500
501+
# Remove the stage/ directory BEFORE creating the PR so it doesn't get committed
502+
- name: Clean up staging cache before commit
503+
run: rm -rf stage/
504+
502505
- name: Create Pull Request for documentation deployment
503506
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
504507
id: cpr

0 commit comments

Comments
 (0)