From e71c3ddee5e4e090387b21a73ede03cfd072590a Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Tue, 7 Jan 2025 18:41:49 +0700 Subject: [PATCH 1/2] add subrepo label --- .github/workflows/autobuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 2d09a9d7f3..f192811858 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -93,7 +93,7 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/* + terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-${{ matrix.pkg.labels.subrepo }}' || '' }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/* - name: Upload source packages to subatomic if: github.event_name == 'push' @@ -101,7 +101,7 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/* + terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-${{ matrix.pkg.labels.subrepo }}' || '' }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/* - name: Notify Madoguchi (Success) if: success() && github.event_name == 'push' From e67305712cbd6b00f996b366a62a71ffb67d71c6 Mon Sep 17 00:00:00 2001 From: Cappy Ishihara Date: Tue, 7 Jan 2025 19:06:02 +0700 Subject: [PATCH 2/2] refactor: update package labels to use 'subrepo' instead of 'extra' --- .github/workflows/autobuild.yml | 4 ++-- anda/apps/switcheroo-control/anda.hcl | 2 +- anda/desktops/gnome/gnome-shell/anda.hcl | 2 +- anda/desktops/kde/kf6-kio/anda.hcl | 2 +- anda/games/gamescope/anda.hcl | 2 +- anda/lib/mesa/anda.hcl | 3 +-- anda/lib/openh264/anda.hcl | 2 +- anda/multimedia/carla/anda.hcl | 2 +- anda/multimedia/rtaudio/anda.hcl | 2 +- anda/multimedia/zrythm/anda.hcl | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index f192811858..585a3d253f 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -93,7 +93,7 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-${{ matrix.pkg.labels.subrepo }}' || '' }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/* + terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-${{ matrix.pkg.labels.subrepo }}' || '' }} anda-build/rpm/rpms/* - name: Upload source packages to subatomic if: github.event_name == 'push' @@ -101,7 +101,7 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-${{ matrix.pkg.labels.subrepo }}' || '' }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/* + terra${{ matrix.version }}${{ matrix.pkg.labels['subrepo'] && '-${{ matrix.pkg.labels.subrepo }}' || '' }}-source anda-build/rpm/srpm/* - name: Notify Madoguchi (Success) if: success() && github.event_name == 'push' diff --git a/anda/apps/switcheroo-control/anda.hcl b/anda/apps/switcheroo-control/anda.hcl index 66361551ee..4e4b929667 100644 --- a/anda/apps/switcheroo-control/anda.hcl +++ b/anda/apps/switcheroo-control/anda.hcl @@ -3,6 +3,6 @@ project pkg { spec = "switcheroo-control.spec" } labels { - extra = 1 + subrepo = "extras" } } diff --git a/anda/desktops/gnome/gnome-shell/anda.hcl b/anda/desktops/gnome/gnome-shell/anda.hcl index 188b77bd79..4777148e0c 100644 --- a/anda/desktops/gnome/gnome-shell/anda.hcl +++ b/anda/desktops/gnome/gnome-shell/anda.hcl @@ -3,6 +3,6 @@ project pkg { spec = "gnome-shell.spec" } labels { - extra = 1 + subrepo = "extras" } } diff --git a/anda/desktops/kde/kf6-kio/anda.hcl b/anda/desktops/kde/kf6-kio/anda.hcl index 75bea8c597..3d706bf811 100644 --- a/anda/desktops/kde/kf6-kio/anda.hcl +++ b/anda/desktops/kde/kf6-kio/anda.hcl @@ -3,6 +3,6 @@ project pkg { spec = "kf6-kio.spec" } labels { - extra = 1 + subrepo = "extras" } } diff --git a/anda/games/gamescope/anda.hcl b/anda/games/gamescope/anda.hcl index f3bf32281b..2ce8de3f1a 100755 --- a/anda/games/gamescope/anda.hcl +++ b/anda/games/gamescope/anda.hcl @@ -4,6 +4,6 @@ project pkg { spec = "gamescope.spec" } labels { - extra = 1 + subrepo = "extras" } } diff --git a/anda/lib/mesa/anda.hcl b/anda/lib/mesa/anda.hcl index 80f31c7444..1c898037d5 100644 --- a/anda/lib/mesa/anda.hcl +++ b/anda/lib/mesa/anda.hcl @@ -5,7 +5,6 @@ project pkg { } labels { - extra = 1 + subrepo = "mesa" } - arches = ["x86_64", "i386", "aarch64"] } diff --git a/anda/lib/openh264/anda.hcl b/anda/lib/openh264/anda.hcl index 3f2c048bee..825d3a7615 100644 --- a/anda/lib/openh264/anda.hcl +++ b/anda/lib/openh264/anda.hcl @@ -3,6 +3,6 @@ project pkg { spec = "openh264.spec" } labels { - extra = 1 + subrepo = "extras" } } diff --git a/anda/multimedia/carla/anda.hcl b/anda/multimedia/carla/anda.hcl index 470d4a4513..fa58c8e5e9 100644 --- a/anda/multimedia/carla/anda.hcl +++ b/anda/multimedia/carla/anda.hcl @@ -4,6 +4,6 @@ project pkg { } labels { nightly = 1 - extra = 1 + subrepo = "extras" } } diff --git a/anda/multimedia/rtaudio/anda.hcl b/anda/multimedia/rtaudio/anda.hcl index 9cb091ad07..30f5c1922d 100644 --- a/anda/multimedia/rtaudio/anda.hcl +++ b/anda/multimedia/rtaudio/anda.hcl @@ -4,6 +4,6 @@ project pkg { } labels { nightly = 1 - extra = 1 + subrepo = "extras" } } diff --git a/anda/multimedia/zrythm/anda.hcl b/anda/multimedia/zrythm/anda.hcl index 9b3e2dd135..078a583760 100644 --- a/anda/multimedia/zrythm/anda.hcl +++ b/anda/multimedia/zrythm/anda.hcl @@ -3,6 +3,6 @@ project pkg { spec = "zrythm.spec" } labels { - extra = 1 + subrepo = "extras" } }