Skip to content

Commit 2ecac56

Browse files
committed
workflows
wf Update ci-auto-rerun-failed-jobs-action.yml workflows
1 parent 05402ef commit 2ecac56

File tree

7 files changed

+26
-13
lines changed

7 files changed

+26
-13
lines changed

.github/workflows/ci-alpine-build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626
type: string
2727
jobs:
2828
build-alpine:
29-
runs-on: ubuntu-24.04
29+
runs-on: ubuntu-24.04-arm
3030
strategy:
3131
fail-fast: false
3232
matrix:
@@ -122,6 +122,10 @@ jobs:
122122
# Allow the user gh to run sudo without password prompt: docker exec -u gh:gh ${container_name} sudo ls
123123
docker exec ${container_name} sh -c 'printf "%s" "gh ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/gh'
124124
125+
- name: Host - patches ${{ inputs.distinct_id }}
126+
if: env.disable_qt5 != 'yes'
127+
run: mkdir -p ${qbt_build_dir}/patches && cp -r patches/* ${qbt_build_dir}/patches/
128+
125129
- name: Docker - apk update ${{ inputs.distinct_id }}
126130
if: env.disable_qt5 != 'yes'
127131
run: docker exec ${container_name} apk update

.github/workflows/ci-alpine-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
jobs:
1212
release:
13-
runs-on: ubuntu-24.04
13+
runs-on: ubuntu-24.04-arm
1414
strategy:
1515
fail-fast: false
1616
matrix:

.github/workflows/ci-auto-rerun-failed-jobs-action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
name: rerun - attempt ${{ inputs.attempts }}
2727
permissions:
2828
actions: write
29-
runs-on: ubuntu-24.04
29+
runs-on: ubuntu-24.04-arm
3030
env:
3131
GH_TOKEN: "${{ secrets.AUTO_RERUN || github.token }}"
3232
steps:

.github/workflows/ci-checks.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ concurrency:
1010

1111
jobs:
1212
sh-checker:
13-
runs-on: ubuntu-24.04
13+
runs-on: ubuntu-24.04-arm
1414
permissions:
1515
contents: read
1616
steps:
@@ -29,7 +29,7 @@ jobs:
2929
sh_checker_exclude: ""
3030

3131
zizmor-checker:
32-
runs-on: ubuntu-24.04
32+
runs-on: ubuntu-24.04-arm
3333
permissions:
3434
contents: read
3535
steps:
@@ -54,7 +54,7 @@ jobs:
5454
exit "$exit_code"
5555
5656
editorconfig-checker:
57-
runs-on: ubuntu-24.04
57+
runs-on: ubuntu-24.04-arm
5858
permissions:
5959
contents: read
6060
steps:

.github/workflows/ci-debian-build.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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
@@ -89,6 +94,10 @@ jobs:
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

.github/workflows/ci-main-reusable-caller.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
cancel-in-progress: true
112112
permissions:
113113
actions: write
114-
runs-on: ubuntu-24.04
114+
runs-on: ubuntu-24.04-arm
115115
env:
116116
GH_TOKEN: "${{ secrets.AUTO_RERUN || github.token }}"
117117
github_repo: "" # To use ci-auto-rerun-failed-jobs.yml hosted in a remote repository else default to the current repository. Requires PAT token AUTO_RERUN

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414

1515
jobs:
1616
build:
17-
runs-on: ubuntu-24.04
17+
runs-on: ubuntu-24.04-arm
1818
permissions:
1919
contents: read
2020
steps:
@@ -30,7 +30,7 @@ jobs:
3030

3131
deploy:
3232
needs: build
33-
runs-on: ubuntu-24.04
33+
runs-on: ubuntu-24.04-arm
3434
permissions:
3535
pages: write
3636
id-token: write

0 commit comments

Comments
 (0)