few changes

* apt-get install ninja-build on Linux Clang * skip empty lines when packaging
MaterializeInc · Aug 25, 2024 · d593fbf · d593fbf
1 parent e9108d6
commit d593fbf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -34,7 +34,7 @@ jobs:
       contents: write
     steps:
       - name: Install required tools
-        run: sudo apt-get install -y zstd cmake gcc ninja
+        run: sudo apt-get install -y zstd cmake gcc ninja-build
 
       - name: Clone MaterializeInc/toolchains repo
         uses: actions/checkout@v4
@@ -146,9 +146,9 @@ jobs:
       - name: package toolchain
         run: |
           mkdir package package/bin package/lib package/include
-          cat clang/bin.txt | while read -r val; do val=${val#linux}; eval cp -rP llvm-project/build/bin/$val package/bin/; done
-          cat clang/include.txt | while read -r val; do val=${val#linux}; eval cp -rP llvm-project/build/include/$val package/include/; done
-          cat clang/lib.txt | while read -r val; do val=${val#linux}; eval cp -rP llvm-project/build/lib/$val package/lib/; done
+          cat clang/bin.txt | while read -r val; do val=${val#linux}; [[ -n $val ]] && eval cp -rP llvm-project/build/bin/$val package/bin/; done
+          cat clang/include.txt | while read -r val; do val=${val#linux}; [[ -n $val ]] && eval cp -rP llvm-project/build/include/$val package/include/; done
+          cat clang/lib.txt | while read -r val; do val=${val#linux}; [[ -n $val ]] && eval cp -rP llvm-project/build/lib/$val package/lib/; done
 
           cd package
           tar -cf - * | zstd --ultra -22 -o "../linux_$CLANG_ARCH.tar.zst"

diff --git a/.github/workflows/macos-clang.yml b/.github/workflows/macos-clang.yml
@@ -98,9 +98,9 @@ jobs:
       - name: package toolchain
         run: |
           mkdir package package/bin package/lib package/include
-          cat clang/bin.txt | while read -r val; do [[ $val != linux* ]] && eval cp -rP llvm-project/build/bin/$val package/bin/; done
-          cat clang/include.txt | while read -r val; do [[ $val != linux* ]] && eval cp -rP llvm-project/build/include/$val package/include/; done
-          cat clang/lib.txt | while read -r val; do [[ $val != linux* ]] && eval cp -rP llvm-project/build/lib/$val package/lib/; done
+          cat clang/bin.txt | while read -r val; do [[ $val != linux* ]] && [[ -n $val ]] && eval cp -rP llvm-project/build/bin/$val package/bin/; done
+          cat clang/include.txt | while read -r val; do [[ $val != linux* ]] && [[ -n $val ]] && eval cp -rP llvm-project/build/include/$val package/include/; done
+          cat clang/lib.txt | while read -r val; do [[ $val != linux* ]] && [[ -n $val ]] && eval cp -rP llvm-project/build/lib/$val package/lib/; done
 
           cd package
           tar -cf - * | zstd --ultra -22 -o "../darwin_$CLANG_ARCH.tar.zst"