@@ -29,10 +29,11 @@ jobs:
2929 defaults :
3030 run :
3131 shell : bash
32- runs-on : ubuntu-24.04
32+ runs-on : ${{ matrix.runs_on }}
3333 strategy :
3434 fail-fast : false
3535 matrix :
36+ runs_on : [ubuntu-24.04, ubuntu-24.04-arm]
3637 container_id : [debian, ubuntu]
3738 container_codename : [bookworm, noble]
3839 qbt_build_tool : ["cmake", "qmake"]
@@ -47,17 +48,21 @@ jobs:
4748 qbt_qt_version : " 5"
4849 - qbt_build_tool : " cmake"
4950 qbt_qt_version : " 6"
51+ - runs_on : ubuntu-24.04
52+ docker_arch : " amd64"
53+ - runs_on : ubuntu-24.04-arm
54+ docker_arch : " arm64v8"
5055
51- name : " ${{ matrix.container_id }}-${{ matrix.container_codename }}-${{ matrix.qbt_libtorrent_version }}-qt-${{ matrix.qbt_qt_version }}-${{ matrix.qbt_build_tool }}"
56+ name : " ${{ matrix.docker_arch }}-${{ matrix. container_id }}-${{ matrix.container_codename }}-${{ matrix.qbt_libtorrent_version }}-qt-${{ matrix.qbt_qt_version }}-${{ matrix.qbt_build_tool }}"
5257
5358 env : # host
5459 qbt_build_dir : " qbt-build"
5560 disable_qt5 : " "
56- artifact_name : " ${{ matrix.container_id }}-${{ matrix.container_codename }}-${{ matrix.qbt_libtorrent_version }}-qt-${{ matrix.qbt_qt_version }}-${{ matrix.qbt_build_tool }}-nox"
61+ artifact_name : " ${{ matrix.docker_arch }}-${{ matrix. container_id }}-${{ matrix.container_codename }}-${{ matrix.qbt_libtorrent_version }}-qt-${{ matrix.qbt_qt_version }}-${{ matrix.qbt_build_tool }}-nox"
5762 script_name : ${{ inputs.script_name }}
5863
5964 container :
60- image : arm64v8 /${{ matrix.container_id }}:${{ matrix.container_codename }}
65+ image : ${{ matrix.docker_arch }} /${{ matrix.container_id }}:${{ matrix.container_codename }}
6166 env : # container
6267 LANG : C.UTF-8
6368 LC_ALL : C.UTF-8
8994 with :
9095 persist-credentials : false
9196
97+ - name : bootstrap patches ${{ inputs.distinct_id }}
98+ if : env.disable_qt5 != 'yes'
99+ run : mkdir -p ${qbt_build_dir}/patches && cp -r patches/* ${qbt_build_dir}/patches/
100+
92101 - name : Bootstrap test tools ${{ inputs.distinct_id }}
93102 run : bash ${script_name} update install_test
94103
0 commit comments