Skip to content

Commit 2586b4b

Browse files
userdocsuserdocs
committed
workflows: qbt_build_tool default is now cmake
1 parent 5e8b085 commit 2586b4b

5 files changed

+25
-50
lines changed

‎.github/workflows/matrix_multi_build_and_release.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838
# qbt_cross_name: [armel,armhf,armv7,aarch64,x86_64,x86,s390x,powerpc,ppc64el,mips,mipsel,mips64,mips64el,riscv64]
3939
qbt_cross_name: ["armhf", "armv7", "aarch64", "x86_64", "x86"]
4040
qbt_libtorrent_version: ["1.2", "2.0"]
41-
qbt_build_tool: ["", "cmake"]
41+
qbt_build_tool: ["", "qmake"]
4242
include:
43-
- qbt_build_tool: ""
43+
- qbt_build_tool: "qmake"
4444
qbt_qt_version_name: "qt5-"
4545
qbt_qt_version: "5"
46-
- qbt_build_tool: "cmake"
46+
- qbt_build_tool: ""
4747
qbt_qt_version_name: ""
4848
qbt_qt_version: "6"
4949

@@ -59,19 +59,14 @@ jobs:
5959
- name: Host - phased updates ${{ github.event.inputs.distinct_id }}
6060
run: printf '%s\n' 'APT::Get::Always-Include-Phased-Updates "false";' | sudo tee /etc/apt/apt.conf.d/99-phased-updates
6161

62-
- name: Host - set up lunar repo -t lunar ${{ github.event.inputs.distinct_id }}
63-
run: |
64-
printf '%b\n' 'Package: *\nPin: release n=lunar\nPin-Priority: 50' | sudo tee /etc/apt/preferences
65-
printf '%b\n' 'deb http://archive.ubuntu.com/ubuntu/ lunar main universe restricted' | sudo tee /etc/apt/sources.list.d/lunar.list
66-
6762
- name: Host - update ${{ github.event.inputs.distinct_id }}
6863
run: sudo apt-get update
6964

7065
- name: Host - upgrade ${{ github.event.inputs.distinct_id }}
7166
run: sudo apt-get -y upgrade
7267

73-
- name: Host - set up qemu-user-static binfmt-support from lunar ${{ github.event.inputs.distinct_id }}
74-
run: sudo apt install -t lunar libpipeline1 qemu-user-static binfmt-support
68+
- name: Host - set up qemu-user-static binfmt-support ${{ github.event.inputs.distinct_id }}
69+
run: sudo apt install libpipeline1 qemu-user-static binfmt-support
7570

7671
- name: Host - Create Docker template env file ${{ github.event.inputs.distinct_id }}
7772
run: |

‎.github/workflows/matrix_multi_build_and_release_artifacts.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ jobs:
6060
# qbt_cross_name: [armel,armhf,armv7,aarch64,x86_64,x86,s390x,powerpc,ppc64el,mips,mipsel,mips64,mips64el,riscv64]
6161
qbt_cross_name: ["armhf", "armv7", "aarch64", "x86_64", "x86"]
6262
qbt_libtorrent_version: ["1.2", "2.0"]
63-
qbt_build_tool: ["", "cmake"]
63+
qbt_build_tool: ["", "qmake"]
6464
include:
65-
- qbt_build_tool: ""
65+
- qbt_build_tool: "qmake"
6666
qbt_qt_version_name: "qt5-"
6767
qbt_qt_version: "5"
68-
- qbt_build_tool: "cmake"
68+
- qbt_build_tool: ""
6969
qbt_qt_version_name: ""
7070
qbt_qt_version: "6"
7171

@@ -81,19 +81,14 @@ jobs:
8181
- name: Host - phased updates ${{ github.event.inputs.distinct_id }}
8282
run: printf '%s\n' 'APT::Get::Always-Include-Phased-Updates "false";' | sudo tee /etc/apt/apt.conf.d/99-phased-updates
8383

84-
- name: Host - set up lunar repo -t lunar ${{ github.event.inputs.distinct_id }}
85-
run: |
86-
printf '%b\n' 'Package: *\nPin: release n=lunar\nPin-Priority: 50' | sudo tee /etc/apt/preferences
87-
printf '%b\n' 'deb http://archive.ubuntu.com/ubuntu/ lunar main universe restricted' | sudo tee /etc/apt/sources.list.d/lunar.list
88-
8984
- name: Host - update ${{ github.event.inputs.distinct_id }}
9085
run: sudo apt-get update
9186

9287
- name: Host - upgrade ${{ github.event.inputs.distinct_id }}
9388
run: sudo apt-get -y upgrade
9489

95-
- name: Host - set up qemu-user-static binfmt-support from lunar ${{ github.event.inputs.distinct_id }}
96-
run: sudo apt install -t lunar libpipeline1 qemu-user-static binfmt-support
90+
- name: Host - set up qemu-user-static binfmt-support ${{ github.event.inputs.distinct_id }}
91+
run: sudo apt install libpipeline1 qemu-user-static binfmt-support
9792

9893
- name: Host - create build dir ${{ github.event.inputs.distinct_id }}
9994
run: mkdir -p ${{ env.qbt_build_dir }}

‎.github/workflows/matrix_multi_build_and_release_customs_tags.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ jobs:
3838
# qbt_cross_name: [armel,armhf,armv7,aarch64,x86_64,x86,s390x,powerpc,ppc64el,mips,mipsel,mips64,mips64el,riscv64]
3939
qbt_cross_name: ["armhf", "armv7", "aarch64", "x86_64", "x86"]
4040
qbt_libtorrent_version: ["1.2", "2.0"]
41-
qbt_build_tool: ["", "cmake"]
41+
qbt_build_tool: ["", "qmake"]
4242
# qbt_boost_tag: [boost-1.84.0]
4343
# qbt_qbittorrent_tag: [master]
4444
include:
45-
- qbt_build_tool: ""
45+
- qbt_build_tool: "qmake"
4646
qbt_qt_version_name: "qt5-"
4747
qbt_qt_version: "5"
4848
# qbt_qt_tag: "v5.15.11-lts-lgpl"
49-
- qbt_build_tool: "cmake"
49+
- qbt_build_tool: ""
5050
qbt_qt_version_name: ""
5151
qbt_qt_version: "6"
5252
qbt_qt_tag: "v6.7.0-beta3"
@@ -67,19 +67,14 @@ jobs:
6767
- name: Host - phased updates
6868
run: printf '%s\n' 'APT::Get::Always-Include-Phased-Updates "false";' | sudo tee /etc/apt/apt.conf.d/99-phased-updates
6969

70-
- name: Host - set up lunar repo -t lunar
71-
run: |
72-
printf '%b\n' 'Package: *\nPin: release n=lunar\nPin-Priority: 50' | sudo tee /etc/apt/preferences
73-
printf '%b\n' 'deb http://archive.ubuntu.com/ubuntu/ lunar main universe restricted' | sudo tee /etc/apt/sources.list.d/lunar.list
74-
7570
- name: Host - update
7671
run: sudo apt-get update
7772

7873
- name: Host - upgrade
7974
run: sudo apt-get -y upgrade
8075

81-
- name: Host - set up qemu-user-static binfmt-support from lunar
82-
run: sudo apt install -t lunar libpipeline1 qemu-user-static binfmt-support
76+
- name: Host - set up qemu-user-static binfmt-support
77+
run: sudo apt install libpipeline1 qemu-user-static binfmt-support
8378

8479
- name: Host - Create Docker template env file
8580
run: |

‎.github/workflows/matrix_multi_build_and_release_qbt_workflow_files.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838
# qbt_cross_name: [armel,armhf,armv7,aarch64,x86_64,x86,s390x,powerpc,ppc64el,mips,mipsel,mips64,mips64el,riscv64]
3939
qbt_cross_name: ["armhf", "armv7", "aarch64", "x86_64", "x86"]
4040
qbt_libtorrent_version: ["1.2", "2.0"]
41-
qbt_build_tool: ["", "cmake"]
41+
qbt_build_tool: ["", "qmake"]
4242
include:
43-
- qbt_build_tool: ""
43+
- qbt_build_tool: "qmake"
4444
qbt_qt_version_name: "qt5-"
4545
qbt_qt_version: "5"
46-
- qbt_build_tool: "cmake"
46+
- qbt_build_tool: ""
4747
qbt_qt_version_name: ""
4848
qbt_qt_version: "6"
4949

@@ -59,19 +59,14 @@ jobs:
5959
- name: Host - phased updates ${{ github.event.inputs.distinct_id }}
6060
run: printf '%s\n' 'APT::Get::Always-Include-Phased-Updates "false";' | sudo tee /etc/apt/apt.conf.d/99-phased-updates
6161

62-
- name: Host - set up lunar repo -t lunar ${{ github.event.inputs.distinct_id }}
63-
run: |
64-
printf '%b\n' 'Package: *\nPin: release n=lunar\nPin-Priority: 50' | sudo tee /etc/apt/preferences
65-
printf '%b\n' 'deb http://archive.ubuntu.com/ubuntu/ lunar main universe restricted' | sudo tee /etc/apt/sources.list.d/lunar.list
66-
6762
- name: Host - update ${{ github.event.inputs.distinct_id }}
6863
run: sudo apt-get update
6964

7065
- name: Host - upgrade ${{ github.event.inputs.distinct_id }}
7166
run: sudo apt-get -y upgrade
7267

73-
- name: Host - set up qemu-user-static binfmt-support from lunar ${{ github.event.inputs.distinct_id }}
74-
run: sudo apt install -t lunar libpipeline1 qemu-user-static binfmt-support
68+
- name: Host - set up qemu-user-static binfmt-support ${{ github.event.inputs.distinct_id }}
69+
run: sudo apt install libpipeline1 qemu-user-static binfmt-support
7570

7671
- name: Host - Create Docker template env file ${{ github.event.inputs.distinct_id }}
7772
run: |

‎.github/workflows/matrix_multi_build_and_release_qbt_workflow_files_debug.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ jobs:
3838
# qbt_cross_name: [armel,armhf,armv7,aarch64,x86_64,x86,s390x,powerpc,ppc64el,mips,mipsel,mips64,mips64el,riscv64]
3939
qbt_cross_name: ["armhf", "armv7", "aarch64", "x86_64", "x86"]
4040
qbt_libtorrent_version: ["1.2", "2.0"]
41-
qbt_build_tool: ["", "cmake"]
41+
qbt_build_tool: ["", "qmake"]
4242
include:
43-
- qbt_build_tool: ""
43+
- qbt_build_tool: "qmake"
4444
qbt_qt_version_name: "qt5-"
4545
qbt_qt_version: "5"
46-
- qbt_build_tool: "cmake"
46+
- qbt_build_tool: ""
4747
qbt_qt_version_name: ""
4848
qbt_qt_version: "6"
4949

@@ -59,19 +59,14 @@ jobs:
5959
- name: Host - phased updates ${{ github.event.inputs.distinct_id }}
6060
run: printf '%s\n' 'APT::Get::Always-Include-Phased-Updates "false";' | sudo tee /etc/apt/apt.conf.d/99-phased-updates
6161

62-
- name: Host - set up lunar repo -t lunar ${{ github.event.inputs.distinct_id }}
63-
run: |
64-
printf '%b\n' 'Package: *\nPin: release n=lunar\nPin-Priority: 50' | sudo tee /etc/apt/preferences
65-
printf '%b\n' 'deb http://archive.ubuntu.com/ubuntu/ lunar main universe restricted' | sudo tee /etc/apt/sources.list.d/lunar.list
66-
6762
- name: Host - update ${{ github.event.inputs.distinct_id }}
6863
run: sudo apt-get update
6964

7065
- name: Host - upgrade ${{ github.event.inputs.distinct_id }}
7166
run: sudo apt-get -y upgrade
7267

73-
- name: Host - set up qemu-user-static binfmt-support from lunar ${{ github.event.inputs.distinct_id }}
74-
run: sudo apt install -t lunar libpipeline1 qemu-user-static binfmt-support
68+
- name: Host - set up qemu-user-static binfmt-support ${{ github.event.inputs.distinct_id }}
69+
run: sudo apt install libpipeline1 qemu-user-static binfmt-support
7570

7671
- name: Host - Create Docker template env file ${{ github.event.inputs.distinct_id }}
7772
run: |

0 commit comments

Comments
 (0)