Skip to content

Commit 82ee307

Browse files
committed
ci: Clone gh-pages branch before attempting to merge the DocC archives
1 parent 757b16e commit 82ee307

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

.github/workflows/build-test-and-docs.yml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,11 @@ jobs:
7676

7777
- name: Build
7878
run: |
79-
set -uo pipefail
79+
set -uexo pipefail
8080
device_type=${{ matrix.device-type }}
8181
set +e
8282
deviceid=$(xcrun simctl list devices $device_type available | grep -v -- -- | tail -n 1 | grep -oE '[0-9A-F\-]{36}')
8383
if [ $? -eq 0 ]; then
84-
set -ex
8584
(
8685
buildtarget () {
8786
# Use the same derived data path as DocC compilation so that we don't duplicate work.
@@ -340,6 +339,15 @@ jobs:
340339
--source-service-base-url https://github.com/stackotter/swift-cross-ui/blob/main \
341340
--checkout-path $(pwd)
342341
342+
- name: Clone gh-pages branch
343+
run: |
344+
set -eux
345+
git config user.email "[email protected]"
346+
git config user.name "stackotter"
347+
348+
git fetch
349+
git worktree add --checkout gh-pages origin/gh-pages
350+
343351
- name: Merge DocC archives
344352
run: |
345353
xcrun docc merge \
@@ -355,12 +363,6 @@ jobs:
355363
run: |
356364
set -eux
357365
358-
git config user.email "[email protected]"
359-
git config user.name "stackotter"
360-
361-
git fetch
362-
git worktree add --checkout gh-pages origin/gh-pages
363-
364366
CURRENT_COMMIT_HASH=`git rev-parse --short HEAD`
365367
366368
cd gh-pages

0 commit comments

Comments
 (0)