Skip to content

Commit

Permalink
Fix ARM build.
Browse files Browse the repository at this point in the history
  • Loading branch information
hipersayanX committed Jun 27, 2024
1 parent 63e7480 commit 8d7dd66
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 47 deletions.
47 changes: 10 additions & 37 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ jobs:
-e REPOSITORY=${{ matrix.repository }}
-e KERNEL_VERSION=${{ matrix.kernel_version }}
-e KERNEL_VERSION_C=${{ matrix.kernel_version_c }}
-e ARCHITECTURE=amd64
-e QTIFWVER=${{ env.QTIFWVER }}
-e UPLOAD=${{ matrix.upload }}
run: |
Expand Down Expand Up @@ -114,6 +115,7 @@ jobs:
-e REPOSITORY=${{ matrix.repository }}
-e KERNEL_VERSION=${{ matrix.kernel_version }}
-e KERNEL_VERSION_C=${{ matrix.kernel_version_c }}
-e ARCHITECTURE=amd64
-e QTIFWVER=${{ env.QTIFWVER }}
-e UPLOAD=${{ matrix.upload }}
-e DAILY_BUILD=1
Expand Down Expand Up @@ -153,50 +155,21 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
multiarch:
name: Ubuntu ARM 64 v8
name: Ubuntu Multiarch
runs-on: ubuntu-latest
strategy:
max-parallel: 10
fail-fast: false
matrix:
include:
- dockerimg: amd64/ubuntu:focal
repository: v4.19.316
kernel_version: 4.19.316-0419316
kernel_version_c: 202406161134
upload: 1
- dockerimg: amd64/ubuntu:focal
repository: v5.4.278
kernel_version: 5.4.278-0504278
kernel_version_c: 202406161242
upload: 0
# Do not update
- dockerimg: amd64/ubuntu:jammy
repository: v5.10.130
kernel_version: 5.10.130-0510130
kernel_version_c: 202207121545
upload: 0
- dockerimg: amd64/ubuntu:jammy
repository: v5.15.161
kernel_version: 5.15.161-0515161
kernel_version_c: 202406161242
upload: 0
- dockerimg: amd64/ubuntu:mantic
repository: v6.1.95
kernel_version: 6.1.95-060195
kernel_version_c: 202406211343
upload: 0
- dockerimg: amd64/ubuntu:oracular
repository: v6.6.35
kernel_version: 6.6.35-060635
kernel_version_c: 202406210941
upload: 0
- dockerimg: amd64/ubuntu:noble
- dockerimg: ubuntu_latest
architecture: aarch64
repository: v6.8.12
kernel_version: 6.8.12-0608012
kernel_version_c: 202405300722
upload: 0
- dockerimg: amd64/ubuntu:noble
upload: 1
- dockerimg: ubuntu_latest
architecture: aarch64
repository: v6.9.3
kernel_version: 6.9.3-060903
kernel_version_c: 202405300957
Expand All @@ -218,8 +191,8 @@ jobs:
GITHUB_SERVER_URL: "${{ env.GITHUB_SERVER_URL }}"
GITHUB_REPOSITORY: "${{ env.GITHUB_REPOSITORY }}"
GITHUB_RUN_ID: "${{ env.GITHUB_RUN_ID }}"
DOCKERIMG: ${{ matrix.dockerimg }}
REPOSITORY: ${{ matrix.repository }}
ARCHITECTURE: ${{ matrix.architecture }}
KERNEL_VERSION: ${{ matrix.kernel_version }}
KERNEL_VERSION_C: ${{ matrix.kernel_version_c }}
QTIFWVER: ${{ env.QTIFWVER }}
Expand Down Expand Up @@ -256,8 +229,8 @@ jobs:
GITHUB_SERVER_URL: "${{ env.GITHUB_SERVER_URL }}"
GITHUB_REPOSITORY: "${{ env.GITHUB_REPOSITORY }}"
GITHUB_RUN_ID: "${{ env.GITHUB_RUN_ID }}"
DOCKERIMG: ${{ matrix.dockerimg }}
REPOSITORY: ${{ matrix.repository }}
ARCHITECTURE: ${{ matrix.architecture }}
KERNEL_VERSION: ${{ matrix.kernel_version }}
KERNEL_VERSION_C: ${{ matrix.kernel_version_c }}
QTIFWVER: ${{ env.QTIFWVER }}
Expand Down
42 changes: 32 additions & 10 deletions ports/ci/linux/install_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,43 @@ apt-get -qq -y install \

mkdir -p .local/bin

architecture="${DOCKERIMG%%/*}"
if [ -z "${ARCHITECTURE}" ]; then
architecture="${DOCKERIMG%%/*}"
else
case "${ARCHITECTURE}" in
aarch64)
architecture=arm64v8
;;
armv7)
architecture=arm32v7
;;
*)
architecture=${ARCHITECTURE}
;;
esac
fi

# Install Qt Installer Framework
if [[ ( "${architecture}" = amd64 || "${architecture}" = arm64v8 ) && ! -z "${QTIFWVER}" ]]; then
# Install Qt Installer Framework

if [[ "${architecture}" = amd64 || "${architecture}" = arm64v8 ]]; then
if [ "${architecture}" = amd64 ]; then
ifwArch=x64
else
ifwArch=arm64
fi
case "${architecture}" in
arm64v8)
qtArch=arm64
;;
*)
qtArch=x64
;;
esac

qtIFW=QtInstallerFramework-linux-${ifwArch}-${QTIFWVER}.run
${DOWNLOAD_CMD} "https://download.qt.io/official_releases/qt-installer-framework/${QTIFWVER}/${qtIFW}" || true
qtIFW=QtInstallerFramework-linux-${qtArch}-${QTIFWVER}.run
${DOWNLOAD_CMD} "http://download.qt.io/official_releases/qt-installer-framework/${QTIFWVER}/${qtIFW}" || true

if [ -e "${qtIFW}" ]; then
if [ "${architecture}" = arm64v8 ]; then
ln -svf libtiff.so.6 /usr/lib/aarch64-linux-gnu/libtiff.so.5
ln -svf libwebp.so.7 /usr/lib/aarch64-linux-gnu/libwebp.so.6
fi

chmod +x "${qtIFW}"
QT_QPA_PLATFORM=minimal \
./"${qtIFW}" \
Expand Down

0 comments on commit 8d7dd66

Please sign in to comment.