From d6a24a4498843be5c85c8787ddbd6c20a34404b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Fri, 6 Oct 2023 22:27:44 +0200 Subject: [PATCH] Switch back to Homebrew-only based builds Build all using Homebrew packages and do not provide artifacts as those are unusable outside the particular build machine. --- .github/workflows/osx.yml | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml index eecb37a..99a4d34 100644 --- a/.github/workflows/osx.yml +++ b/.github/workflows/osx.yml @@ -11,45 +11,27 @@ jobs: runs-on: macos-latest steps: - name: Set environment variables - run: echo "PATH=/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV + run: echo "PATH=/usr/local/opt/qt@5/bin:/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v3 - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - version: '5.15.2' - - name: Install protobuf - run: brew install protobuf@21 + - name: Install dependencies + run: brew install qt@5 protobuf@21 - name: Configure build run: qmake PROTOBUF=/usr/local/opt/protobuf@21 pbfplugin.pro - name: Build project run: make -j3 - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: libpbf-qt5.dylib - path: libpbf.dylib qt6: name: QtPBFImagePlugin Qt6 build runs-on: macos-latest steps: - name: Set environment variables - run: echo "PATH=/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV + run: echo "PATH=/usr/local/opt/qt@6/bin:/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v3 - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - version: '6.5.1' - - name: Install protobuf - run: brew install protobuf@21 + - name: Install dependencies + run: brew install qt@6 protobuf@21 - name: Configure build run: qmake PROTOBUF=/usr/local/opt/protobuf@21 pbfplugin.pro - name: Build project run: make -j3 - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: libpbf-qt6.dylib - path: libpbf.dylib