frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

set CMAKE_SYSTEM_PROCESSOR

Browse Source
This commit is contained in:
Paulchen-Panther
2025-02-09 14:14:27 +01:00
parent 74a18258c1
commit 71352948ea
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/scripts/build.sh vendored
View File

@@ -5,6 +5,7 @@
[ -z "${TARGET_ARCH}" ] && TARGET_ARCH="linux/amd64" [ -z "${TARGET_ARCH}" ] && TARGET_ARCH="linux/amd64"
[ -z "${ENTRYPOINT}" ] && ENTRYPOINT="" [ -z "${ENTRYPOINT}" ] && ENTRYPOINT=""
[ -z "${PLATFORM}" ] && PLATFORM="x11" [ -z "${PLATFORM}" ] && PLATFORM="x11"
[ -z "${CMAKE_SYSTEM_PROCESSOR}" ] && CMAKE_SYSTEM_PROCESSOR=""
# Determine cmake build type; tag builds are Release, else Debug (-dev appends to platform) # Determine cmake build type; tag builds are Release, else Debug (-dev appends to platform)
if [[ $GITHUB_REF == *"refs/tags"* ]]; then if [[ $GITHUB_REF == *"refs/tags"* ]]; then
@@ -45,7 +46,7 @@ elif [[ "$RUNNER_OS" == 'Linux' ]]; then
-v "${GITHUB_WORKSPACE}:/source:rw" \ -v "${GITHUB_WORKSPACE}:/source:rw" \
$REGISTRY_URL:$DOCKER_TAG \ $REGISTRY_URL:$DOCKER_TAG \
/bin/bash -c "mkdir -p /source/build && cd /source/build && /bin/bash -c "mkdir -p /source/build && cd /source/build &&
cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} .. || exit 2 && cmake -G Ninja -DPLATFORM=${PLATFORM} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CMAKE_SYSTEM_PROCESSOR} .. || exit 2 &&
cmake --build . --target package -- -j $(nproc) || exit 3 || : && cmake --build . --target package -- -j $(nproc) || exit 3 || : &&
cp /source/build/bin/h* /deploy/ 2>/dev/null || : && cp /source/build/bin/h* /deploy/ 2>/dev/null || : &&
cp /source/build/Hyperion-* /deploy/ 2>/dev/null || : && cp /source/build/Hyperion-* /deploy/ 2>/dev/null || : &&

8
.github/workflows/qt5_6.yml vendored
View File

@@ -49,6 +49,7 @@ jobs:
{ distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 2), architecture: [ armv7, linux/arm/v7 ], platform: rpi }, { distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 2), architecture: [ armv7, linux/arm/v7 ], platform: rpi },
{ distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 3/4/5 & Zero 2), architecture: [ arm64, linux/arm64 ], platform: rpi } { distribution: debian, codename: bullseye, description: Debian Bullseye (Raspberry Pi 3/4/5 & Zero 2), architecture: [ arm64, linux/arm64 ], platform: rpi }
] ]
target_lookup: [{ 'arm64': 'arm64', 'armv6': 'armv6l', 'armv7': 'armv7l' }]
isQt5: isQt5:
- ${{ inputs.qt_version == '5' }} - ${{ inputs.qt_version == '5' }}
exclude: exclude:
@@ -73,10 +74,6 @@ jobs:
fi fi
echo '::endgroup::' echo '::endgroup::'
- name: 🛠️ Set up QEMU (Raspberry Pi only)
if: matrix.os.platform == 'rpi'
uses: docker/setup-qemu-action@v3
- name: 👷 Build - name: 👷 Build
shell: bash shell: bash
run: ./.github/scripts/build.sh run: ./.github/scripts/build.sh
@@ -84,7 +81,8 @@ jobs:
DOCKER_IMAGE: ${{ matrix.os.distribution }} DOCKER_IMAGE: ${{ matrix.os.distribution }}
DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }} DOCKER_TAG: ${{ matrix.os.codename }}${{ inputs.qt_version == '6' && '-qt6' || '' }}
PLATFORM: ${{ matrix.os.platform }} PLATFORM: ${{ matrix.os.platform }}
# ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }} ENTRYPOINT: ${{ matrix.os.architecture[0] != 'amd64' && '--entrypoint /usr/bin/env' || '' }}
CMAKE_SYSTEM_PROCESSOR: ${{ matrix.os.architecture[0] != 'amd64' && format('-DCMAKE_SYSTEM_PROCESSOR={0}', matrix.target_lookup[format('{0}', matrix.os.architecture[0])]) || '' }}
TARGET_ARCH: ${{ matrix.os.architecture[1] }} TARGET_ARCH: ${{ matrix.os.architecture[1] }}
- name: 📦 Upload - name: 📦 Upload