Do the same in the Qt actions

Dadoum · Oct 24, 2023 · 152ca9a · 152ca9a
1 parent 9555d51
commit 152ca9a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
@@ -108,8 +108,6 @@ jobs:
               ];
           };
           EOF
-          curl -LO https://github.com/ldc-developers/ldc/releases/download/v1.32.2/ldc2-1.32.2-linux-aarch64.tar.xz
-          tar -xf ./ldc2-1.32.2-linux-aarch64.tar.xz -C $HOME
 
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install -y libz-dev elfutils gcc-aarch64-linux-gnu
@@ -145,10 +143,6 @@ jobs:
         with:
           compiler: ldc-1.33.0
 
-      - name: Set up Homebrew
-        id: set-up-homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-
       - name: Set-up macOS cross-compilation
         run: |
           mkdir -p $HOME/.ldc/
@@ -180,8 +174,6 @@ jobs:
           mkdir $HOME/ldc-macos
           curl -LO https://github.com/ldc-developers/ldc/releases/download/v1.33.0/ldc2-1.33.0-osx-x86_64.tar.xz
           tar -xf ./ldc2-1.33.0-osx-x86_64.tar.xz -C $HOME
-          brew fetch --force --bottle-tag=monterey llvm
-          brew install $(brew --cache --bottle-tag=monterey llvm)
 
       - name: Install dependencies
         run: sudo apt-get update && sudo apt-get install -y libz-dev elfutils clang lld
@@ -213,10 +205,6 @@ jobs:
         with:
           compiler: ldc-1.33.0
 
-      - name: Set up Homebrew
-        id: set-up-homebrew
-        uses: Homebrew/actions/setup-homebrew@master
-
       - name: Set-up macOS cross-compilation
         run: |
           mkdir -p $HOME/.ldc/

diff --git a/.github/workflows/build-qt.yml b/.github/workflows/build-qt.yml
@@ -48,6 +48,10 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
@@ -95,6 +99,8 @@ jobs:
           mkdir $HOME/ldc-macos
           curl -LO https://github.com/ldc-developers/ldc/releases/download/v1.33.0/ldc2-1.33.0-osx-x86_64.tar.xz
           tar -xf ./ldc2-1.33.0-osx-x86_64.tar.xz -C $HOME
+          brew fetch --force --bottle-tag=monterey llvm
+          brew install $(brew --cache --bottle-tag=monterey llvm)
 
       - name: Set-up Qt for cross-compilation
         run:
@@ -130,6 +136,10 @@ jobs:
         with:
           compiler: ldc-1.33.0
 
+      - name: Set up Homebrew
+        id: set-up-homebrew
+        uses: Homebrew/actions/setup-homebrew@master
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
@@ -173,6 +183,8 @@ jobs:
           mkdir $HOME/ldc-macos
           curl -LO https://github.com/ldc-developers/ldc/releases/download/v1.33.0/ldc2-1.33.0-osx-arm64.tar.xz
           tar -xf ./ldc2-1.33.0-osx-arm64.tar.xz -C $HOME
+          curl -LO https://github.com/ldc-developers/ldc/releases/download/v1.32.2/ldc2-1.32.2-linux-aarch64.tar.xz
+          tar -xf ./ldc2-1.32.2-linux-aarch64.tar.xz -C $HOME
 
       - name: Set-up Qt for cross-compilation
         run: