Don't install LLVM dependencies with brew. We don't want to use LLVM …

…anyway.
Dadoum · May 17, 2024 · ccbe04c · ccbe04c
1 parent a50bbb0
commit ccbe04c
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/build-qt.yml b/.github/workflows/build-qt.yml
@@ -108,14 +108,13 @@ jobs:
           curl -LO https://github.com/ldc-developers/ldc/releases/download/v$LDC_VERSION/ldc2-$LDC_VERSION-osx-x86_64.tar.xz
           tar -xf ./ldc2-$LDC_VERSION-osx-x86_64.tar.xz -C $HOME
           brew fetch --force --bottle-tag=monterey llvm
-          brew install $(brew --cache --bottle-tag=monterey llvm)
+          brew install --ignore-dependencies $(brew --cache --bottle-tag=monterey llvm)
           cp /home/linuxbrew/.linuxbrew/Cellar/llvm/*/lib/c++/* $HOME/ldc2-$LDC_VERSION-osx-x86_64/lib
           rm -rf /home/linuxbrew/.linuxbrew
 
       - name: Set-up Qt for cross-compilation
         run:
-          LDC_VERSION=$(ldc2 --version | head -n 1 | grep -oE "[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*")
-          cp -r $Qt5_DIR/lib/* $HOME/ldc2-$LDC_VERSION-osx-x86_64/lib
+          cp -r $Qt5_DIR/lib/* $HOME/ldc2-*-osx-x86_64/lib
 
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install -y libz-dev elfutils clang lld-15
@@ -211,14 +210,13 @@ jobs:
           curl -LO https://github.com/ldc-developers/ldc/releases/download/v$LDC_VERSION/ldc2-$LDC_VERSION-osx-arm64.tar.xz
           tar -xf ./ldc2-$LDC_VERSION-osx-arm64.tar.xz -C $HOME
           brew fetch --force --bottle-tag=arm64_monterey llvm
-          brew install $(brew --cache --bottle-tag=arm64_monterey llvm)
+          brew install --ignore-dependencies $(brew --cache --bottle-tag=arm64_monterey llvm)
           cp /home/linuxbrew/.linuxbrew/Cellar/llvm/*/lib/c++/* $HOME/ldc2-$LDC_VERSION-osx-arm64/lib
           rm -rf /home/linuxbrew/.linuxbrew
 
       - name: Set-up Qt for cross-compilation
         run:
-          LDC_VERSION=$(ldc2 --version | head -n 1 | grep -oE "[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*")
-          cp -r $Qt5_DIR/lib/* $HOME/ldc2-$LDC_VERSION-osx-arm64/lib
+          cp -r $Qt5_DIR/lib/* $HOME/ldc2-*-osx-arm64/lib
 
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install -y libz-dev elfutils clang lld-15