ldionne updated this revision to Diff 519824.
ldionne added a comment.
Use tarball
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D149752/new/
https://reviews.llvm.org/D149752
Files:
clang/foo
libcxx/utils/ci/buildkite-pipeline-clang.yml
libcxx/utils/ci/generate-buildkite-pipeline
llvm/cmake/modules/LLVMInstallSymlink.cmake
Index: llvm/cmake/modules/LLVMInstallSymlink.cmake
===================================================================
--- llvm/cmake/modules/LLVMInstallSymlink.cmake
+++ llvm/cmake/modules/LLVMInstallSymlink.cmake
@@ -17,7 +17,7 @@
endif()
set(outdir "${DESTDIR}${outdir}")
- message(STATUS "Creating ${name}")
+ message(STATUS "Creating ${name} with ${link_or_copy}")
execute_process(
COMMAND "${CMAKE_COMMAND}" -E ${link_or_copy} "${target}" "${name}"
Index: libcxx/utils/ci/generate-buildkite-pipeline
===================================================================
--- libcxx/utils/ci/generate-buildkite-pipeline
+++ libcxx/utils/ci/generate-buildkite-pipeline
@@ -19,7 +19,7 @@
CLANG_CHANGED=true
fi
-if [[ "${CLANG_CHANGED}" == "true" && "${LIBCXX_CHANGED}" != "true" ]]; then
+if [[ "${CLANG_CHANGED}" == "true" ]]; then
cat libcxx/utils/ci/buildkite-pipeline-clang.yml
else
cat libcxx/utils/ci/buildkite-pipeline.yml
Index: libcxx/utils/ci/buildkite-pipeline-clang.yml
===================================================================
--- libcxx/utils/ci/buildkite-pipeline-clang.yml
+++ libcxx/utils/ci/buildkite-pipeline-clang.yml
@@ -24,7 +24,8 @@
# but with the number of jobs we run daily, this can result in thousands
of GB of network I/O.
- "cmake -S llvm -B build -G Ninja -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=install -DLLVM_ENABLE_PROJECTS=\"clang;compiler-rt\""
- "ninja -C build install-clang install-clang-resource-headers"
- - "buildkite-agent artifact upload --debug 'install/**/*'"
+ - "tar -czvf install.tar.gz install/"
+ - "buildkite-agent artifact upload --debug install.tar.gz"
env:
CC: "clang-${LLVM_HEAD_VERSION}"
CXX: "clang++-${LLVM_HEAD_VERSION}"
@@ -41,7 +42,8 @@
- label: "C++03"
commands:
- - "buildkite-agent artifact download 'install/**' ."
+ - "buildkite-agent artifact download install.tar.gz ."
+ - "tar -xzvf install.tar.gz"
- "export CC=$(pwd)/install/bin/clang"
- "export CXX=$(pwd)/install/bin/clang++"
- "chmod +x install/bin/clang install/bin/clang++"
@@ -63,7 +65,8 @@
- label: "C++2b"
commands:
- - "buildkite-agent artifact download 'install/**' ."
+ - "buildkite-agent artifact download install.tar.gz ."
+ - "tar -xzvf install.tar.gz"
- "export CC=$(pwd)/install/bin/clang"
- "export CXX=$(pwd)/install/bin/clang++"
- "chmod +x install/bin/clang install/bin/clang++"
@@ -85,7 +88,8 @@
- label: "Modules"
commands:
- - "buildkite-agent artifact download 'install/**' ."
+ - "buildkite-agent artifact download install.tar.gz ."
+ - "tar -xzvf install.tar.gz"
- "export CC=$(pwd)/install/bin/clang"
- "export CXX=$(pwd)/install/bin/clang++"
- "chmod +x install/bin/clang install/bin/clang++"
Index: llvm/cmake/modules/LLVMInstallSymlink.cmake
===================================================================
--- llvm/cmake/modules/LLVMInstallSymlink.cmake
+++ llvm/cmake/modules/LLVMInstallSymlink.cmake
@@ -17,7 +17,7 @@
endif()
set(outdir "${DESTDIR}${outdir}")
- message(STATUS "Creating ${name}")
+ message(STATUS "Creating ${name} with ${link_or_copy}")
execute_process(
COMMAND "${CMAKE_COMMAND}" -E ${link_or_copy} "${target}" "${name}"
Index: libcxx/utils/ci/generate-buildkite-pipeline
===================================================================
--- libcxx/utils/ci/generate-buildkite-pipeline
+++ libcxx/utils/ci/generate-buildkite-pipeline
@@ -19,7 +19,7 @@
CLANG_CHANGED=true
fi
-if [[ "${CLANG_CHANGED}" == "true" && "${LIBCXX_CHANGED}" != "true" ]]; then
+if [[ "${CLANG_CHANGED}" == "true" ]]; then
cat libcxx/utils/ci/buildkite-pipeline-clang.yml
else
cat libcxx/utils/ci/buildkite-pipeline.yml
Index: libcxx/utils/ci/buildkite-pipeline-clang.yml
===================================================================
--- libcxx/utils/ci/buildkite-pipeline-clang.yml
+++ libcxx/utils/ci/buildkite-pipeline-clang.yml
@@ -24,7 +24,8 @@
# but with the number of jobs we run daily, this can result in thousands of GB of network I/O.
- "cmake -S llvm -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=install -DLLVM_ENABLE_PROJECTS=\"clang;compiler-rt\""
- "ninja -C build install-clang install-clang-resource-headers"
- - "buildkite-agent artifact upload --debug 'install/**/*'"
+ - "tar -czvf install.tar.gz install/"
+ - "buildkite-agent artifact upload --debug install.tar.gz"
env:
CC: "clang-${LLVM_HEAD_VERSION}"
CXX: "clang++-${LLVM_HEAD_VERSION}"
@@ -41,7 +42,8 @@
- label: "C++03"
commands:
- - "buildkite-agent artifact download 'install/**' ."
+ - "buildkite-agent artifact download install.tar.gz ."
+ - "tar -xzvf install.tar.gz"
- "export CC=$(pwd)/install/bin/clang"
- "export CXX=$(pwd)/install/bin/clang++"
- "chmod +x install/bin/clang install/bin/clang++"
@@ -63,7 +65,8 @@
- label: "C++2b"
commands:
- - "buildkite-agent artifact download 'install/**' ."
+ - "buildkite-agent artifact download install.tar.gz ."
+ - "tar -xzvf install.tar.gz"
- "export CC=$(pwd)/install/bin/clang"
- "export CXX=$(pwd)/install/bin/clang++"
- "chmod +x install/bin/clang install/bin/clang++"
@@ -85,7 +88,8 @@
- label: "Modules"
commands:
- - "buildkite-agent artifact download 'install/**' ."
+ - "buildkite-agent artifact download install.tar.gz ."
+ - "tar -xzvf install.tar.gz"
- "export CC=$(pwd)/install/bin/clang"
- "export CXX=$(pwd)/install/bin/clang++"
- "chmod +x install/bin/clang install/bin/clang++"
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
