From 6a215c3d32dacad42ade2de0376f13eb181da936 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Sun, 2 Apr 2023 16:38:25 +0000 Subject: [PATCH 01/19] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index bafc72c5c1..d7f9fcae2f 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: osu-lazer -Version: 2023.326.1 +Version: 2023.403.0 Release: 1%{?dist} Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From 6f69a2fe61922180972204c94109e2db1ce291df Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Apr 2023 01:15:54 +0000 Subject: [PATCH 02/19] bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly --- anda/games/prismlauncher-nightly/prismlauncher-nightly.spec | 2 +- .../prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index 610a7a23c6..d142a86de0 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 09d607f39c47a467de5dde260e90771ad0ac51df +%global commit 0a9081cb878044ec70f40f46082a23c5e821b101 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 579c467ba9..1e5dc6fd2b 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,6 +1,6 @@ %global real_name prismlauncher -%global commit 09d607f39c47a467de5dde260e90771ad0ac51df +%global commit 0a9081cb878044ec70f40f46082a23c5e821b101 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit 2203af7eeb48c45398139b583615134efd8d407f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 From 0b0df1d24525e7a0407c8bbc3afb4e21726c9a8d Mon Sep 17 00:00:00 2001 From: Raboneko Date: Mon, 3 Apr 2023 04:36:37 +0000 Subject: [PATCH 03/19] bump: osu-lazer --- anda/games/osu-lazer/osu-lazer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/games/osu-lazer/osu-lazer.spec b/anda/games/osu-lazer/osu-lazer.spec index d7f9fcae2f..503e72e13b 100644 --- a/anda/games/osu-lazer/osu-lazer.spec +++ b/anda/games/osu-lazer/osu-lazer.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: osu-lazer -Version: 2023.403.0 +Version: 2023.403.1 Release: 1%{?dist} Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew. ExclusiveArch: x86_64 From 340723efed68ef94ad9fcb9f71a9c4b720c9155f Mon Sep 17 00:00:00 2001 From: Raboneko Date: Tue, 4 Apr 2023 18:15:58 +0000 Subject: [PATCH 04/19] bump: elementary-sideload elementary-terminal switchboard-plug-onlineaccounts --- .../elementary/elementary-sideload/elementary-sideload.spec | 4 ++-- .../elementary/elementary-terminal/elementary-terminal.spec | 2 +- .../switchboard-plug-onlineaccounts.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec index 1ffdb4e0f4..0a55fd346d 100644 --- a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec +++ b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec @@ -3,8 +3,8 @@ Name: elementary-sideload Summary: Sideload flatpaks on Pantheon -Version: 6.1.0 -Release: %autorelease +Version: 6.2.0 +Release: 1%{?dist} License: GPL-3.0-or-later URL: https://github.com/elementary/sideload diff --git a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec index ef1b61538f..ca5b06e446 100644 --- a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec +++ b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec @@ -3,7 +3,7 @@ Name: elementary-terminal Summary: The terminal of the 21st century -Version: 6.1.1 +Version: 6.1.2 Release: 1%{?dist} License: LGPL-3.0 diff --git a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec index dc3a8ad616..1445a3946f 100644 --- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec +++ b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec @@ -6,7 +6,7 @@ Name: switchboard-plug-onlineaccounts Summary: Switchboard Online Accounts plug -Version: 6.5.1 +Version: 6.5.2 Release: 1%{?dist} License: GPL-3.0-or-later From 918261dfbca5d5b66769058e2b5f92483c8c8514 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Apr 2023 01:00:25 +0000 Subject: [PATCH 05/19] bump: gala --- anda/desktops/elementary/gala/gala.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/elementary/gala/gala.spec b/anda/desktops/elementary/gala/gala.spec index b79f96c654..fe179b0ebb 100644 --- a/anda/desktops/elementary/gala/gala.spec +++ b/anda/desktops/elementary/gala/gala.spec @@ -2,7 +2,7 @@ Name: gala Summary: Gala window manager -Version: 7.0.1 +Version: 7.0.2 Release: 1%{?dist} License: GPL-3.0-or-later From ed434d29a9a2935efc527a7685aa0f178f09ed9c Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Apr 2023 03:15:14 +0000 Subject: [PATCH 06/19] bump: ruff --- anda/python/ruff/python3-ruff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index 861a3cf57b..10ee6c2d56 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.0.260 +Version: 0.0.261 Release: 1%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT From 708e3d0af47194b0c986e45ed2ed0ddffb9cb280 Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 5 Apr 2023 13:17:13 +0800 Subject: [PATCH 07/19] fix(update): glewmx (#350) --- anda/lib/glewmx/glewmx.spec | 2 +- anda/lib/glewmx/update.rhai | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/lib/glewmx/glewmx.spec b/anda/lib/glewmx/glewmx.spec index 4e3886b6c8..d3576cb1d0 100644 --- a/anda/lib/glewmx/glewmx.spec +++ b/anda/lib/glewmx/glewmx.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: glewmx -Version: 1.13.0. +Version: 1.13.0 Release: 1%{?dist} Summary: OpenGL Extension Wrangler MX diff --git a/anda/lib/glewmx/update.rhai b/anda/lib/glewmx/update.rhai index 6ea5197ee3..16134d2d81 100644 --- a/anda/lib/glewmx/update.rhai +++ b/anda/lib/glewmx/update.rhai @@ -1,3 +1,3 @@ let html = get("http://archive.ubuntu.com/ubuntu/pool/universe/g/glewmx/?C=N;O=D"); -let v = find("glewmx_([\\d.+]+).", html, 1); +let v = find("glewmx_([\\d.+]+)\\.", html, 1); rpm.version(v); From 975797502f3c20d034d33946f6a066ca975656e2 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Wed, 5 Apr 2023 18:20:40 +0000 Subject: [PATCH 08/19] bump: elementary-files --- anda/desktops/elementary/elementary-files/elementary-files.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/desktops/elementary/elementary-files/elementary-files.spec b/anda/desktops/elementary/elementary-files/elementary-files.spec index ad2bd69f53..554c1bac04 100644 --- a/anda/desktops/elementary/elementary-files/elementary-files.spec +++ b/anda/desktops/elementary/elementary-files/elementary-files.spec @@ -5,7 +5,7 @@ Name: elementary-files Summary: File manager from elementary -Version: 6.3.0 +Version: 6.3.1 Release: 1%{?dist} License: GPL-3.0 From d5c6c171bfa00265a6460eaeb35dbde4f5304576 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Apr 2023 10:14:47 +0000 Subject: [PATCH 09/19] bump: maturin --- anda/rust/maturin/rust-maturin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/rust/maturin/rust-maturin.spec b/anda/rust/maturin/rust-maturin.spec index 34b8879ea6..5de1b894b9 100644 --- a/anda/rust/maturin/rust-maturin.spec +++ b/anda/rust/maturin/rust-maturin.spec @@ -2,7 +2,7 @@ %global crate maturin Name: rust-maturin -Version: 0.14.16 +Version: 0.14.17 Release: 1%{?dist} Summary: Build and publish crates with pyo3, rust-cpython and cffi bindings as well as rust binaries as python packages From 7f6fddb01dc8cf4e9604dd1760e8361a894d765c Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Thu, 6 Apr 2023 09:04:31 -0700 Subject: [PATCH 10/19] fix(lomiri-session): correct the filename in anda.hcl (#351) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/others/lomiri-session/anda.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/others/lomiri-session/anda.hcl b/anda/others/lomiri-session/anda.hcl index 7f84a8142d..d82c3e755f 100644 --- a/anda/others/lomiri-session/anda.hcl +++ b/anda/others/lomiri-session/anda.hcl @@ -1,5 +1,5 @@ project "pkg" { rpm { - spec = "lomiri-desktop-session.spec" + spec = "lomiri-session.spec" } } From 1c22928ae2839c00eaea2f4043596efb058d62c3 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Thu, 6 Apr 2023 10:08:59 -0700 Subject: [PATCH 11/19] fix: ubuntu-sdk (#352) * chore(ubuntu-sdk): run test build Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> * fix(ubuntu-sdk): don't point inside the buildroot Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --------- Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/others/ubuntu-sdk/ubuntu-sdk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/anda/others/ubuntu-sdk/ubuntu-sdk.spec b/anda/others/ubuntu-sdk/ubuntu-sdk.spec index a9dbde760f..713e59928b 100644 --- a/anda/others/ubuntu-sdk/ubuntu-sdk.spec +++ b/anda/others/ubuntu-sdk/ubuntu-sdk.spec @@ -30,8 +30,8 @@ mkdir -m 0755 -p %{buildroot}%{_datadir}/ubports/changelogs %{buildroot}%{_datad install -Dm644 changelogs/* %{buildroot}%{_datadir}/ubports/changelogs install -Dm644 frameworks/* %{buildroot}%{_datadir}/click/frameworks -ln -s %{buildroot}%{_datadir}/click/frameworks/ubuntu-sdk-%{version}.framework %{buildroot}%{_datadir}/click/frameworks/current -ln -s %{buildroot}%{_datadir}/ubports/changelogs/%{version} %{buildroot}%{_datadir}/ubports/changelogs/current +ln -s %{_datadir}/click/frameworks/ubuntu-sdk-%{version}.framework %{buildroot}%{_datadir}/click/frameworks/current +ln -s %{_datadir}/ubports/changelogs/%{version} %{buildroot}%{_datadir}/ubports/changelogs/current %files %license COPYING From 8efe19de1d440f8b136d8e05aa542911cab32ca9 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Thu, 6 Apr 2023 10:09:33 -0700 Subject: [PATCH 12/19] chore: move libayatana-common inside lib (#353) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/{ => lib}/libayatana-common/anda.hcl | 0 anda/{ => lib}/libayatana-common/libayatana-common.spec | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename anda/{ => lib}/libayatana-common/anda.hcl (100%) rename anda/{ => lib}/libayatana-common/libayatana-common.spec (100%) diff --git a/anda/libayatana-common/anda.hcl b/anda/lib/libayatana-common/anda.hcl similarity index 100% rename from anda/libayatana-common/anda.hcl rename to anda/lib/libayatana-common/anda.hcl diff --git a/anda/libayatana-common/libayatana-common.spec b/anda/lib/libayatana-common/libayatana-common.spec similarity index 100% rename from anda/libayatana-common/libayatana-common.spec rename to anda/lib/libayatana-common/libayatana-common.spec From 4445d0be252028a97b186b7f7a25d07050c097e5 Mon Sep 17 00:00:00 2001 From: Raboneko Date: Thu, 6 Apr 2023 22:13:02 +0000 Subject: [PATCH 13/19] bump: sass --- anda/others/sass/sass.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anda/others/sass/sass.spec b/anda/others/sass/sass.spec index ccf8a66953..e3cf844ce6 100644 --- a/anda/others/sass/sass.spec +++ b/anda/others/sass/sass.spec @@ -4,7 +4,7 @@ %define _build_id_links none Name: sass -Version: 1.60.0 +Version: 1.61.0 Release: 1%{?dist} Summary: The reference implementation of Sass, written in Dart License: MIT From a514643c8eabdaaea48ef3acdda7b8473d0523ff Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 7 Apr 2023 00:14:33 -0700 Subject: [PATCH 14/19] fix(lomiri): update commit and get working (#355) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/desktops/lomiri/lomiri.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/anda/desktops/lomiri/lomiri.spec b/anda/desktops/lomiri/lomiri.spec index e0ea69952a..35de24c195 100644 --- a/anda/desktops/lomiri/lomiri.spec +++ b/anda/desktops/lomiri/lomiri.spec @@ -1,5 +1,5 @@ %global forgeurl https://gitlab.com/ubports/development/core/lomiri -%global commit c6f7dc9dc556cd003144be79259a6fe71cc09a55 +%global commit 49d67f32d4710ce5fb9597fe52b97b6c152d5b4f %forgemeta Name: lomiri @@ -65,6 +65,8 @@ Requires: lomiri-ui-toolkit Requires: lomiri-download-manager Requires: suru-icon-theme Requires: lomiri-schemas +# For some reason Lomiri `/usr/bin/lomiri` requires it for testability +Requires: %{name}-tests%{?_isa} = %{version}-%{release} %description Lomiri, Previously Unity8 is a convergent desktop environment built with Qt. @@ -96,10 +98,18 @@ The %{name}-tests package contains test files for %{name}. #cd tests/autopilot && python setup.py install %find_lang %{name} +mkdir -m 0755 -p %{buildroot}%{_sysconfdir}/lomiri %{buildroot}%{_sysconfdir}/lomirisensors +install -Dm644 data/devices.conf %{buildroot}%{_sysconfdir}/lomiri +install -Dm644 data/test.sensors %{buildroot}%{_sysconfdir}/lomirisensors + %ldconfig_scriptlets %files -f %{name}.lang %license COPYING COPYING.LGPL +%dir %{_sysconfdir}/lomiri +%{_sysconfdir}/lomiri/devices.conf +%dir %{_sysconfdir}/lomirisensors +%{_sysconfdir}/lomirisensors/test.sensors %{_bindir}/indicators-client %{_bindir}/lomiri %{_userunitdir}/*.service From a59679eceea405a2b493e3e0f821f7b9838a5b6f Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 7 Apr 2023 00:14:51 -0700 Subject: [PATCH 15/19] fix(lomiri): add missing dependencies (#354) Signed-off-by: cat-master21 <96554164+cat-master21@users.noreply.github.com> --- anda/lib/qtdbusmock/qtdbusmock.spec | 1 + anda/lib/qtmir/qtmir.spec | 1 + 2 files changed, 2 insertions(+) diff --git a/anda/lib/qtdbusmock/qtdbusmock.spec b/anda/lib/qtdbusmock/qtdbusmock.spec index ff1e4904eb..552fa2af19 100644 --- a/anda/lib/qtdbusmock/qtdbusmock.spec +++ b/anda/lib/qtdbusmock/qtdbusmock.spec @@ -17,6 +17,7 @@ BuildRequires: pkgconfig(libqtdbustest-1) BuildRequires: pkgconfig(libnm) BuildRequires: pkgconfig(gmock) BuildRequires: pkgconfig(gtest) +Requires: qt5-qtdbustest %description A simple library for mocking DBus services with a Qt API. diff --git a/anda/lib/qtmir/qtmir.spec b/anda/lib/qtmir/qtmir.spec index f8f9eed9ba..f55f15dfd6 100644 --- a/anda/lib/qtmir/qtmir.spec +++ b/anda/lib/qtmir/qtmir.spec @@ -54,6 +54,7 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: glm-devel BuildRequires: boost-devel +Requires: process-cpp Requires: xorg-x11-server-Xwayland %description From 4a2cced2bf6d4cf62558498f88bd55ec790be58b Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 7 Apr 2023 16:44:56 +0800 Subject: [PATCH 16/19] feat(ci): add ci support for madoguchi (#310) * wip * feat(ci): add Madoguchi support to autobuild ci --- .github/workflows/autobuild.yml | 27 ++++++--------------------- .github/workflows/mg.sh | 12 ++++++++++++ 2 files changed, 18 insertions(+), 21 deletions(-) create mode 100644 .github/workflows/mg.sh diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 6e8f11431e..37197bb4e4 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -29,26 +29,6 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 - #- run: git checkout HEAD^ - - # - name: Generate Build matrix - # id: generate_build_matrix - # # generate build matrix by checking out changes in anda/ - # run: | - # # get the list of changed folders in the current commit, including subfolders - # changed_folders=$(git diff --name-only HEAD^ | grep -oP 'anda\/(.+)(\/|\$)' | sort -u ) - # echo "Changed folders: $changed_folders" - # # if changed_folders is empty then set is empty to true - # if [ -z "$changed_folders" ]; then - # echo "::set-output name=is_empty::true" - # else - # echo "::set-output name=is_empty::false" - # fi - # # turn it into a json array - # build_matrix=$(echo "$changed_folders" | jq -R . | jq -s . | jq -c .) - - # echo "::set-output name=build_matrix::$build_matrix" - # #echo "::set-output name=build_matrix::$build_matrix" - name: Generate build matrix id: generate_build_matrix run: | @@ -80,7 +60,8 @@ jobs: extraArgs: -D "sccache_bucket ${{secrets.SCCACHE_BUCKET}}" -D "sccache_endpoint ${{secrets.SCCACHE_ENDPOINT}}" -D "sccache_secret ${{secrets.SCCACHE_SECRET}}" -D "sccache_accesskey ${{secrets.SCCACHE_ACCESSKEY}}" andaRepo: https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo - - id: art + - name: Generating artifact name + id: art run: | NAME=${{ matrix.pkg.pkg }}-${{ matrix.pkg.arch }}-${{ matrix.version }} x=${NAME//\//@} @@ -98,3 +79,7 @@ jobs: --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ terra${{ matrix.version }} anda-build/rpm/rpms/* + + - name: Notify Madoguchi + if: always() + run: ./.github/workflows/mg.sh ${{success()}} ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} diff --git a/.github/workflows/mg.sh b/.github/workflows/mg.sh new file mode 100644 index 0000000000..2078f87d5a --- /dev/null +++ b/.github/workflows/mg.sh @@ -0,0 +1,12 @@ +if $1; then + dirs=${$2/\/pkg/} + export p="{\"id\":\"$5\",\"verl\":\"%v\",\"arch\":\"$4\",\"dirs\":\"$dirs\"}" +else + export p="{\"id\":\"$5\",\"verl\":\"%v\",\"arch\":\"$4\"}" +fi +for f in anda-build/rpm/rpms/*; do + n=$(lesspipe.sh $f | grep -E "Name\s*: " | sed "s@Name\s*: @@") + v=$(echo ${f/${n}-/} | sed -E "s@\.fc$3.+@@") + curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d ${p/%v/$v} --fail-with-body & +done +wait From 2d2e74497e1635576c29bc54f613a6d144cdda63 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 7 Apr 2023 18:14:41 +0800 Subject: [PATCH 17/19] feat(ci): add Madoguchi to build.yml (#356) * wip * feat(ci): add Madoguchi support to autobuild ci * feat(ci): add Madoguchi to build.yml --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b364f03837..46c72c68d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,3 +41,7 @@ jobs: --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ terra${{ matrix.version }} anda-build/rpm/rpms/* + + - name: Notify Madoguchi + if: always() + run: ./.github/workflows/mg.sh ${{success()}} ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} From 6c9986c5205cb63cc1ee1cd0702ff333f2973991 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 7 Apr 2023 18:19:48 +0800 Subject: [PATCH 18/19] fix: elementary-sideload elementary-terminal switchboard-plug-onlineaccounts (#357) --- .../elementary-sideload.spec | 4 +- .../00-drop-upstream-tests.patch | 23 ----- .../elementary-terminal.spec | 3 - ...0458a23a2f76ad14d399f145e150e1ab82d3.patch | 94 ------------------- .../switchboard-plug-onlineaccounts.spec | 6 +- 5 files changed, 4 insertions(+), 126 deletions(-) delete mode 100644 anda/desktops/elementary/elementary-terminal/00-drop-upstream-tests.patch delete mode 100644 anda/desktops/elementary/switchboard-plug-onlineaccounts/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch diff --git a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec index 0a55fd346d..0970fb4dfa 100644 --- a/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec +++ b/anda/desktops/elementary/elementary-sideload/elementary-sideload.spec @@ -48,7 +48,7 @@ desktop-file-validate \ %{buildroot}/%{_datadir}/applications/%{appname}.desktop appstream-util validate-relax --nonet \ - %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml + %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml %files -f %{appname}.lang @@ -60,7 +60,7 @@ appstream-util validate-relax --nonet \ %{_datadir}/applications/%{appname}.desktop %{_datadir}/icons/hicolor/*/apps/%{appname}.svg %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml -%{_datadir}/metainfo/%{appname}.appdata.xml +%{_datadir}/metainfo/%{appname}.metainfo.xml %changelog diff --git a/anda/desktops/elementary/elementary-terminal/00-drop-upstream-tests.patch b/anda/desktops/elementary/elementary-terminal/00-drop-upstream-tests.patch deleted file mode 100644 index 3b11261ba1..0000000000 --- a/anda/desktops/elementary/elementary-terminal/00-drop-upstream-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/data/meson.build b/data/meson.build -index 435b841..321d7fb 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -32,18 +32,6 @@ i18n.merge_file ( - po_dir: join_paths(meson.source_root (), 'po', 'extra') - ) - --test ( -- 'Validate desktop file', -- find_program('desktop-file-validate'), -- args: join_paths(meson.current_build_dir (), meson.project_name() + '.desktop') --) -- --test ( -- 'Validate open here desktop file', -- find_program('desktop-file-validate'), -- args: join_paths(meson.current_build_dir (), 'open-pantheon-terminal-here.desktop') --) -- - install_data( - 'pantheon_terminal_process_completion_notifications.fish', - install_dir: join_paths(get_option('datadir'), 'fish', 'vendor_conf.d') diff --git a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec index ca5b06e446..7f733ec770 100644 --- a/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec +++ b/anda/desktops/elementary/elementary-terminal/elementary-terminal.spec @@ -10,9 +10,6 @@ License: LGPL-3.0 URL: https://github.com/elementary/%{srcname} Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -# drop upstream tests that only validate .desktop and appdata files -Patch0: 00-drop-upstream-tests.patch - BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libappstream-glib diff --git a/anda/desktops/elementary/switchboard-plug-onlineaccounts/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch b/anda/desktops/elementary/switchboard-plug-onlineaccounts/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch deleted file mode 100644 index ecbe624b23..0000000000 --- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch +++ /dev/null @@ -1,94 +0,0 @@ -From b60f0458a23a2f76ad14d399f145e150e1ab82d3 Mon Sep 17 00:00:00 2001 -From: Bobby Rong -Date: Sat, 23 Jul 2022 10:45:28 +0800 -Subject: [PATCH] build: support evolution-data-server 3.45 - ---- - meson.build | 3 +++ - src/Dialogs/CaldavDialog.vala | 23 +++++++++++++++++++++++ - 2 files changed, 26 insertions(+) - -diff --git a/meson.build b/meson.build -index 61fa00b5..72387657 100644 ---- a/meson.build -+++ b/meson.build -@@ -44,6 +44,9 @@ switchboard_dep = dependency('switchboard-2.0') - if edataserverui_dep.version().version_compare('>=3.39.2') - add_project_arguments('--define=HAS_EDS_3_40', language: 'vala') - endif -+if edataserverui_dep.version().version_compare('>=3.45.1') -+ add_project_arguments('--define=HAS_EDS_3_46', language: 'vala') -+endif - - gresource = gnome.compile_resources( - 'gresource', -diff --git a/src/Dialogs/CaldavDialog.vala b/src/Dialogs/CaldavDialog.vala -index b658b266..c6c934b2 100644 ---- a/src/Dialogs/CaldavDialog.vala -+++ b/src/Dialogs/CaldavDialog.vala -@@ -397,7 +397,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window { - col.backend_name = "caldav"; - - unowned var webdav = (E.SourceWebdav)source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ webdav.uri = GLib.Uri.parse (url_entry.text, GLib.UriFlags.NONE); -+#else - webdav.soup_uri = new Soup.URI (url_entry.text); -+#endif - webdav.calendar_auto_schedule = true; - - unowned var auth = (E.SourceAuthentication)source.get_extension (E.SOURCE_EXTENSION_AUTHENTICATION); -@@ -473,7 +477,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window { - string? webdav_host = null; - if (source.has_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND)) { - unowned var webdav_extension = (E.SourceWebdav) source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ webdav_host = webdav_extension.uri.get_host (); -+#else - webdav_host = webdav_extension.soup_uri.host; -+#endif - } - - foreach (unowned E.WebDAVDiscoveredSource? disc_source in discovered_sources) { -@@ -486,7 +494,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window { - }; - - unowned var webdav = (E.SourceWebdav) e_source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ webdav.uri = GLib.Uri.parse (disc_source.href, GLib.UriFlags.NONE); -+#else - webdav.soup_uri = new Soup.URI (disc_source.href); -+#endif - webdav.color = disc_source.color; - - switch (only_supports) { -@@ -550,10 +562,17 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window { - - if (collection_source.has_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND)) { - unowned var webdav_extension = (E.SourceWebdav) collection_source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ url_entry.text = webdav_extension.uri.to_string (); -+ -+ if (webdav_extension.uri.get_user () != null && webdav_extension.uri.get_user () != "") { -+ url_entry.text = url_entry.text.replace (webdav_extension.uri.get_user () + "@", ""); -+#else - url_entry.text = webdav_extension.soup_uri.to_string (false); - - if (webdav_extension.soup_uri.user != null && webdav_extension.soup_uri.user != "") { - url_entry.text = url_entry.text.replace (webdav_extension.soup_uri.user + "@", ""); -+#endif - } - } - -@@ -589,7 +608,11 @@ public class OnlineAccounts.CaldavDialog : Hdy.Window { - authentication_extension.user = username_entry.text; - - unowned var webdav_extension = (E.SourceWebdav) collection_source.get_extension (E.SOURCE_EXTENSION_WEBDAV_BACKEND); -+#if HAS_EDS_3_46 -+ webdav_extension.uri = GLib.Uri.parse (url_entry.text, GLib.UriFlags.NONE); -+#else - webdav_extension.soup_uri = new Soup.URI (url_entry.text); -+#endif - webdav_extension.calendar_auto_schedule = true; - - unowned var offline_extension = (E.SourceOffline) collection_source.get_extension (E.SOURCE_EXTENSION_OFFLINE); diff --git a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec index 1445a3946f..9e6ed1dc28 100644 --- a/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec +++ b/anda/desktops/elementary/switchboard-plug-onlineaccounts/switchboard-plug-onlineaccounts.spec @@ -18,8 +18,6 @@ BuildRequires: libappstream-glib BuildRequires: meson BuildRequires: vala -Patch0: b60f0458a23a2f76ad14d399f145e150e1ab82d3.patch - BuildRequires: pkgconfig(camel-1.2) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) @@ -71,8 +69,8 @@ appstream-util validate-relax --nonet \ %changelog -* Thu Nov 17 2022 windowsboy111 - 6.5.1-1 -- new version +* Thu Nov 17 2022 windowsboy111 - 6.5.1-1 +- New version * Sat Oct 15 2022 windowsboy111 - Repackaged for Terra From bdf876117a7da63afeb37835409d19f5f316184b Mon Sep 17 00:00:00 2001 From: windowsboy111 Date: Fri, 7 Apr 2023 18:23:53 +0800 Subject: [PATCH 19/19] fix(ci): autobuild build (mg) --- .github/workflows/autobuild.yml | 9 ++++++--- .github/workflows/build.yml | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 37197bb4e4..58771a7d73 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -80,6 +80,9 @@ jobs: --token ${{ secrets.SUBATOMIC_TOKEN }} \ terra${{ matrix.version }} anda-build/rpm/rpms/* - - name: Notify Madoguchi - if: always() - run: ./.github/workflows/mg.sh ${{success()}} ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + - name: Notify Madoguchi (Success) + if: success() + run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + - name: Notify Madoguchi (Failure) + if: !success() + run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46c72c68d1..930a57f309 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -42,6 +42,9 @@ jobs: --token ${{ secrets.SUBATOMIC_TOKEN }} \ terra${{ matrix.version }} anda-build/rpm/rpms/* - - name: Notify Madoguchi - if: always() - run: ./.github/workflows/mg.sh ${{success()}} ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + - name: Notify Madoguchi (Success) + if: success() + run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}} + - name: Notify Madoguchi (Failure) + if: !success() + run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}