From: Soeren Apel <redacted>
Date: Thu, 7 Mar 2024 15:11:40 +0000 (+0100)
Subject: build.yml: Clean up
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=e88112970ef15291c9589aff0a9976f65e86ebd4;p=sigrok-build.git

build.yml: Clean up
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 172674f..7fa2937 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -383,70 +383,20 @@ jobs:
 
     env:
       TARGET: "x86"
-      # We use Homebrew Python 3.x (current)
       BREW_PYTHON_VERSION: "python@3"
+      BREW_QT_VERSION: "qt"
       # Artifact infos
       ARTIFACT_TITLE: "PulseView"
       ARTIFACT_BIN_NAME: "pulseview"
       ARTIFACT_VERSION: "NIGHTLY"
 
     steps:
-#      - name: test
-#          find / -iname "qt*.rb"
-#        run: |
-#          ls -al /System/Volumes/Data/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/q/qt@5.rb
-#          sed -i '' 's/"make"/"make -j 8"/' /System/Volumes/Data/usr/local/Homebrew/Library/Taps/homebrew/homebrew-core/Formula/q/qt@5.rb
-
-      # ------------------------------------------
-#      - name: Check for dependency cache (1)
-#        uses: actions/cache/restore@v3
-#        id: cache-1
-#        with:
-#          path: /usr/local/Cellar/
-#          key: homebrew-packages-1
-
-      - name: Install dependencies (1)
-#        if: steps.cache-1.outputs.cache-hit != 'true'
+      - name: Install dependencies
         run: |
           brew install autoconf automake autoconf-archive pkg-config libtool \
           libzip libusb libftdi hidapi nettle check doxygen swig \
-          glib glibmm@2.66 cmake boost sdcc $BREW_PYTHON_VERSION
- #         bison flex krb5 libxslt sqlite freetype jpeg-turbo libpng pcre2 webp
-          # Last line are qt5 dependencies, taken from https://github.com/Homebrew/homebrew-core/blob/5aaa8a4d48eb29ebadf716834355312f41154162/Formula/q/qt@5.rb
-
-#      - name: Cache Homebrew Packages (1)
-#        if: steps.cache-1.outputs.cache-hit != 'true'
-#        uses: actions/cache/save@v3
-#        with:
-#          path: /usr/local/Cellar/
-#          key: homebrew-packages-1
-
-      # ------------------------------------------
-#      - name: Check for dependency cache (2)
-#        uses: actions/cache/restore@v3
-#        id: cache-2
-#        with:
-#          path: /usr/local/Cellar/
-#          key: homebrew-packages-2
-
-      - name: Install dependencies (2)
-        if: steps.cache-2.outputs.cache-hit != 'true'
-        run: |
-          brew install qt
-#          wget -O "/tmp/qtAT5.rb" "https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/q/qt%405.rb"
-#          sed -i '' 's/"make"/"make -j 8"/' "/tmp/qtAT5.rb"
-#          sed -i '' 's/qtAT5/qtat5/' /tmp/qtAT5.rb
-#          cat /tmp/qtAT5.rb
-#          brew reinstall webp
-
-#      - name: Cache Homebrew Packages (2)
-#        if: steps.cache-2.outputs.cache-hit != 'true'
-#        uses: actions/cache/save@v3
-#        with:
-#          path: /usr/local/Cellar/
-#          key: homebrew-packages-2
-
-      # ------------------------------------------
+          glib glibmm@2.66 cmake boost sdcc $BREW_PYTHON_VERSION $BREW_QT_VERSION
+
       - name: Checkout sigrok-build
         uses: actions/checkout@v4
         with: