Skip to content

Commit 8e18556

Browse files
author
Christian Feldmann
committed
Test all mac7linux/ourQt
1 parent b85f485 commit 8e18556

File tree

1 file changed

+12
-26
lines changed

1 file changed

+12
-26
lines changed

.github/workflows/Build.yml

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -51,27 +51,11 @@ jobs:
5151
# make -j $(sysctl -n hw.logicalcpu)
5252
# - name: Run Unittests
5353
# run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest
54-
build-unix:
54+
build-linux-mac:
5555
runs-on: ${{ matrix.os }}
5656
strategy:
5757
matrix:
58-
include:
59-
- os: ubuntu-22.04
60-
LIBDE265_REMOTE: libde265.so
61-
LIBDE265_LOCAL: libde265-internals.so
62-
CPU_COUNT_COMMAND: nproc
63-
# - os: macos-13
64-
# QT_FILE: qtBase_6.7.2_mac13.zip
65-
# LIBDE265_REMOTE: libde265.dylib
66-
# LIBDE265_LOCAL: libde265-internals.dylib
67-
# ARTIFACT_NAME: YUView-Mac13-Monterey.zip
68-
# CPU_COUNT_COMMAND: sysctl -n hw.logicalcpu
69-
# - os: macos-15
70-
# QT_FILE: qtBase_6.7.2_mac15.zip
71-
# LIBDE265_REMOTE: libde265.dylib
72-
# LIBDE265_LOCAL: libde265-internals.dylib
73-
# ARTIFACT_NAME: YUView-Mac15-Sequoia.zip
74-
# CPU_COUNT_COMMAND: sysctl -n hw.logicalcpu
58+
os: [ubuntu-22.04, macos-13, macos-15]
7559
steps:
7660
- uses: actions/checkout@v4
7761
with:
@@ -81,9 +65,7 @@ jobs:
8165
id: artifacts
8266
shell: bash
8367
run: |
84-
echo "OpenSSL file: qt=qtBase-6-9-0-${{ matrix.os }}"
8568
echo "qt=qtBase-6-9-0-${{ matrix.os }}" >> "$GITHUB_OUTPUT"
86-
echo "Artifact output: output=YUView-${{ matrix.os }}"
8769
echo "output=YUView-${{ matrix.os }}" >> "$GITHUB_OUTPUT"
8870
- name: Install Qt base
8971
run: |
@@ -104,19 +86,23 @@ jobs:
10486
run: |
10587
sudo apt-get update
10688
sudo apt-get install libgl1-mesa-dev libxkbcommon-x11-0 libpcre2-16-0 '^libxcb.*-dev' libx11-xcb-dev libglu1-mesa-dev libxi-dev libxkbcommon-dev libxkbcommon-x11-dev libatspi2.0-dev libfuse2
107-
- name: Install libde265
108-
run: |
109-
curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/${{matrix.LIBDE265_REMOTE}} -o ${{matrix.LIBDE265_LOCAL}}
110-
curl -L https://raw.githubusercontent.com/ChristianFeldmann/libde265/master/COPYING -o libde265License.txt
89+
- name: Download libde265 (Linux)
90+
if: runner.os == 'Linux'
91+
run: curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.so -o libde265-internals.so
92+
- name: Download libde265 (Mac)
93+
if: runner.os == 'macOS'
94+
run: curl -L https://github.com/ChristianFeldmann/libde265/releases/download/v1.1/libde265.dylib -o libde265-internals.dylib
95+
- name: Download libde265 license file
96+
run: curl -L https://raw.githubusercontent.com/ChristianFeldmann/libde265/master/COPYING -o libde265License.txt
11197
shell: bash
112-
- name: Build
98+
- name: Build (Qmake + Make)
11399
run: |
114100
cd $GITHUB_WORKSPACE
115101
export PATH=$GITHUB_WORKSPACE/../../YUViewQt/YUViewQt/Qt/bin:$PATH
116102
mkdir build
117103
cd build
118104
qmake CONFIG+=UNITTESTS ..
119-
make -j $(${{matrix.CPU_COUNT_COMMAND}})
105+
make -j 4
120106
- name: Run Unittests
121107
run: $GITHUB_WORKSPACE/build/YUViewUnitTest/YUViewUnitTest
122108
- name: Build App (Mac)

0 commit comments

Comments
 (0)