Allow merging single doccarchives

Author: ffried

.github/workflows/swift-generate-and-publish-docs.yml

@@ -211,14 +211,11 @@ jobs:
         env:
           OUTPUT_PATH: ${{ inputs.repository }}-combined.doccarchive
         run: |
-          if [ "$(find artifacts -type d -name '*.doccarchive' -print | wc -l)" -gt 1 ]; then
-            # We could use `xargs -J` in POSIX - but GNU xargs doesn't have -J...
-            find artifacts -type d -name '*.doccarchive' -print0 \
+          # We could use `xargs -J` in POSIX - but GNU xargs doesn't have -J...
+          # The exec mkdir is currently needed when merging a single archive. Otherwise `docc merge` fails.
+          find artifacts -type d -name '*.doccarchive' -exec mkdir -p '{}/data/tutorials' '{}/data/documentation' \; -print0 \
             | xargs --null --no-run-if-empty \
               sh -c "'$(which docc || xcrun --find docc)' merge \"\$@\" --output-path '${OUTPUT_PATH}'" sh
-          else
-            find artifacts -type d -name '*.doccarchive' -exec cp -R '{}' "$(realpath "${OUTPUT_PATH}")" \;
-          fi
       - name: Package combined docs
         env:
           REPO_NAME: ${{ inputs.repository }}