Skip to content

[libc++][libunwind] Fix documentation CI job after #118159 #118555

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.

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

Merged
merged 1 commit into from
Dec 4, 2024

Conversation

ldionne
Copy link
Member

@ldionne ldionne commented Dec 3, 2024

No description provided.

@ldionne ldionne requested review from a team as code owners December 3, 2024 22:08
@llvmbot llvmbot added libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. libunwind github:workflow labels Dec 3, 2024
@llvmbot
Copy link
Member

llvmbot commented Dec 3, 2024

@llvm/pr-subscribers-libcxx
@llvm/pr-subscribers-github-workflow

@llvm/pr-subscribers-libunwind

Author: Louis Dionne (ldionne)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/118555.diff

3 Files Affected:

  • (modified) .github/workflows/docs.yml (+2-2)
  • (added) libcxx/docs/foo ()
  • (added) libunwind/docs/foo ()
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index fe9c70cf1f5a95..0bb018b780a2a1 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -148,14 +148,14 @@ jobs:
           cmake -B libunwind-build -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_RUNTIMES="libunwind" -DLLVM_ENABLE_SPHINX=ON ./runtimes
           TZ=UTC ninja -C libunwind-build docs-libunwind-html
           mkdir built-docs/libunwind
-          cp -r libunwind-build/docs/* built-docs/libunwind
+          cp -r libunwind-build/libunwind/docs/* built-docs/libunwind
       - name: Build libcxx docs
         if: steps.docs-changed-subprojects.outputs.libcxx_any_changed == 'true'
         run: |
           cmake -B libcxx-build -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx;libunwind" -DLLVM_ENABLE_SPHINX=ON ./runtimes
           TZ=UTC ninja -C libcxx-build docs-libcxx-html
           mkdir built-docs/libcxx
-          cp -r libcxx-build/docs/* built-docs/libcxx/
+          cp -r libcxx-build/libcxx/docs/* built-docs/libcxx/
       - name: Build libc docs
         if: steps.docs-changed-subprojects.outputs.libc_any_changed == 'true'
         run: |
diff --git a/libcxx/docs/foo b/libcxx/docs/foo
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/libunwind/docs/foo b/libunwind/docs/foo
new file mode 100644
index 00000000000000..e69de29bb2d1d6

@ldionne ldionne force-pushed the review/fix-libcxx-documentation-build branch from 73e5664 to b3b1cb2 Compare December 4, 2024 17:30
@ldionne ldionne merged commit ef164ec into llvm:main Dec 4, 2024
5 of 7 checks passed
@ldionne ldionne deleted the review/fix-libcxx-documentation-build branch December 4, 2024 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
github:workflow libc++ libc++ C++ Standard Library. Not GNU libstdc++. Not libc++abi. libunwind
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants