From e50a00c32675c09f2313b8a8572aad22001ac619 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Fri, 19 Jul 2024 02:24:15 +0000 Subject: [PATCH 1/2] bump: libhelium tau-helium --- anda/lib/libhelium/libhelium.spec | 2 +- anda/themes/tau-helium/tau-helium.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/libhelium/libhelium.spec b/anda/lib/libhelium/libhelium.spec index a78b218852..1f8cf9f9fa 100644 --- a/anda/lib/libhelium/libhelium.spec +++ b/anda/lib/libhelium/libhelium.spec @@ -1,6 +1,6 @@ Summary: The Application Framework for tauOS apps Name: libhelium -Version: 1.8.12.5 +Version: 1.8.12.7 Release: 1%?dist License: GPL-3.0 URL: https://github.com/tau-OS/libhelium diff --git a/anda/themes/tau-helium/tau-helium.spec b/anda/themes/tau-helium/tau-helium.spec index 9d8c2f437a..5a73aad022 100644 --- a/anda/themes/tau-helium/tau-helium.spec +++ b/anda/themes/tau-helium/tau-helium.spec @@ -1,4 +1,4 @@ -%global ver 1.8.12-4 +%global ver 1.8.12-5 Summary: tauOS GTK/GNOME Shell Themes Name: tau-helium From e8e046121a45d64c249018043c4793d2d2433f18 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Fri, 19 Jul 2024 11:23:14 +0700 Subject: [PATCH 2/2] feat: multilib for x86 (#1549) * feat: multilib for x86 * feat: Build i686 for x86 targets if multilib --- .github/workflows/autobuild.yml | 5 +++++ anda/terra/mock-configs/terra-39-i386.cfg | 5 +++++ anda/terra/mock-configs/terra-40-i386.cfg | 5 +++++ anda/terra/mock-configs/terra-mock-configs.spec | 16 +++++++++++++++- anda/terra/mock-configs/terra-rawhide-i386.cfg | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 anda/terra/mock-configs/terra-39-i386.cfg create mode 100644 anda/terra/mock-configs/terra-40-i386.cfg create mode 100644 anda/terra/mock-configs/terra-rawhide-i386.cfg diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index fca369071c..75098fb844 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -60,6 +60,11 @@ jobs: - name: Build with Andaman run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg + + - name: Build with Andaman (alternate arch) + if: | + matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib'] + run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-i386.cfg - name: Generating artifact name id: art diff --git a/anda/terra/mock-configs/terra-39-i386.cfg b/anda/terra/mock-configs/terra-39-i386.cfg new file mode 100644 index 0000000000..7b57433f26 --- /dev/null +++ b/anda/terra/mock-configs/terra-39-i386.cfg @@ -0,0 +1,5 @@ +config_opts['releasever'] = '39' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') + +include('templates/terra.tpl') diff --git a/anda/terra/mock-configs/terra-40-i386.cfg b/anda/terra/mock-configs/terra-40-i386.cfg new file mode 100644 index 0000000000..6e2647df9a --- /dev/null +++ b/anda/terra/mock-configs/terra-40-i386.cfg @@ -0,0 +1,5 @@ +config_opts['releasever'] = '40' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') + +include('templates/terra.tpl') diff --git a/anda/terra/mock-configs/terra-mock-configs.spec b/anda/terra/mock-configs/terra-mock-configs.spec index d782cb3252..cd4503c095 100644 --- a/anda/terra/mock-configs/terra-mock-configs.spec +++ b/anda/terra/mock-configs/terra-mock-configs.spec @@ -1,5 +1,5 @@ Name: terra-mock-configs -Version: 10 +Version: 11 Release: 1%{?dist} Summary: Mock configs for Terra repos @@ -10,6 +10,11 @@ Source3: terra-39-x86_64.cfg Source4: terra-39-aarch64.cfg Source5: terra-40-x86_64.cfg Source6: terra-40-aarch64.cfg +Source7: terra-40-i386.cfg +Source8: terra-39-i386.cfg +Source9: terra-rawhide-x86_64.cfg +Source10: terra-rawhide-aarch64.cfg +Source11: terra-rawhide-i386.cfg BuildRequires: mock-core-configs @@ -35,15 +40,24 @@ cp -v %{SOURCE3} %{buildroot}%{_sysconfdir}/mock/ cp -v %{SOURCE4} %{buildroot}%{_sysconfdir}/mock/ cp -v %{SOURCE5} %{buildroot}%{_sysconfdir}/mock/ cp -v %{SOURCE6} %{buildroot}%{_sysconfdir}/mock/ +cp -v %{SOURCE7} %{buildroot}%{_sysconfdir}/mock/ +cp -v %{SOURCE8} %{buildroot}%{_sysconfdir}/mock/ +cp -v %{SOURCE9} %{buildroot}%{_sysconfdir}/mock/ +cp -v %{SOURCE10} %{buildroot}%{_sysconfdir}/mock/ +cp -v %{SOURCE11} %{buildroot}%{_sysconfdir}/mock/ %files %config %{_sysconfdir}/mock/templates/terra.tpl %config %{_sysconfdir}/mock/terra-*-x86_64.cfg %config %{_sysconfdir}/mock/terra-*-aarch64.cfg +%config %{_sysconfdir}/mock/terra-*-i386.cfg %changelog +* Wed Jul 18 2024 Cappy Ishihara - 11-1 +- Include multilib mock files for x86-based systems (backwards compatibility) + * Wed Jul 10 2024 madonuko - 10-1 - Include mock files for Terra 40 - Remove mock files for Terra 38 diff --git a/anda/terra/mock-configs/terra-rawhide-i386.cfg b/anda/terra/mock-configs/terra-rawhide-i386.cfg new file mode 100644 index 0000000000..518184ea6d --- /dev/null +++ b/anda/terra/mock-configs/terra-rawhide-i386.cfg @@ -0,0 +1,5 @@ +config_opts['releasever'] = 'rawhide' +config_opts['target_arch'] = 'i686' +config_opts['legal_host_arches'] = ('i386', 'i586', 'i686', 'x86_64') + +include('templates/terra.tpl')