From 5ca006bbabaaa3ad4231ba17779d96f47e3c3089 Mon Sep 17 00:00:00 2001 From: "J. Caleb Wherry" <337871+calebwherry@users.noreply.github.com> Date: Wed, 28 Feb 2024 11:23:19 -0500 Subject: [PATCH] 19462: Adds `docs` folder to install with new version.json file (#84) Also fixes action depends bug in mac large runner on GitHub. --- .github/workflows/build.yml | 1 + CMakeLists.txt | 1 + build/cmake/install_docs.cmake | 14 ++++++++++++++ build/cmake/version.cmake | 3 +++ 4 files changed, 19 insertions(+) create mode 100644 build/cmake/install_docs.cmake diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 923a9315..31e665ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -404,6 +404,7 @@ jobs: - smoke-test-linux-arm64 - smoke-test-linux-arm64_8a - smoke-test-macos-amd64 + - smoke-test-macos-amd64-large - smoke-test-macos-amd64-on-arm64 - smoke-test-macos-arm64 - smoke-test-windows-amd64 diff --git a/CMakeLists.txt b/CMakeLists.txt index 24cb8a2b..41ed1413 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -291,3 +291,4 @@ endif() include(create_tests) include(create_package) +include(install_docs) diff --git a/build/cmake/install_docs.cmake b/build/cmake/install_docs.cmake new file mode 100644 index 00000000..8c9fd940 --- /dev/null +++ b/build/cmake/install_docs.cmake @@ -0,0 +1,14 @@ +# +# Install docs +# + +# Install language reference: +install( + FILES + "${CMAKE_SOURCE_DIR}/docs/index.html" + "${CMAKE_SOURCE_DIR}/docs/language.js" + DESTINATION "docs/language_reference" +) + +# Install version.json: +install(FILES "${CMAKE_BINARY_DIR}/version.json" DESTINATION "docs") diff --git a/build/cmake/version.cmake b/build/cmake/version.cmake index 52966fde..29788f1f 100644 --- a/build/cmake/version.cmake +++ b/build/cmake/version.cmake @@ -114,3 +114,6 @@ configure_file( NEWLINE_STYLE ${NEWLINE_STYLE} @ONLY ) + +# Write version.json: +file(WRITE "${CMAKE_BINARY_DIR}/version.json" "{\n \"version\": \"${AMALGAM_VERSION_FULL}\"\n}")