From aa21bc8994a2e5775cd50620b607eea29e815a4f Mon Sep 17 00:00:00 2001 From: madomado Date: Wed, 1 Jan 2025 03:39:56 +0800 Subject: [PATCH] fix(ci/{build,json-build}): support the extra label in anda.hcl (#2731) --- .github/workflows/build.yml | 5 +++-- .github/workflows/json-build.yml | 5 ++--- andax/get_proj_label.rhai | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 andax/get_proj_label.rhai diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 774ab28510..8322b7b656 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,6 +79,7 @@ jobs: NAME=${{ matrix.pkg }}-${{ matrix.arch }}-${{ matrix.version }} x=${NAME//\//@} echo "name=$x" >> $GITHUB_OUTPUT + echo "labels=$(anda run andax/get_proj_label.rhai -l project=anda/${{ matrix.pkg }}anda.hcl)" >> $GITHUB_OUTPUT - uses: actions/upload-artifact@v4 with: @@ -93,14 +94,14 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra${{ matrix.version }} anda-build/rpm/rpms/* + terra${{ matrix.version }}${{ fromJson(steps.art.outputs.labels)['extra'] && '-extras' }} anda-build/rpm/rpms/* - name: Upload source packages to subatomic run: | subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra${{ matrix.version }}-source anda-build/rpm/srpm/* + terra${{ matrix.version }}${{ fromJson(steps.art.outputs.labels)['extra'] && '-extras' }}-source anda-build/rpm/srpm/* - name: Notify Madoguchi (Success) if: success() diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index 68f869ff8e..6f4a37e76b 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -59,15 +59,14 @@ jobs: subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra${{ matrix.version }} anda-build/rpm/rpms/* + terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }} anda-build/rpm/rpms/* - name: Upload source packages to subatomic - if: github.event_name == 'push' run: | subatomic-cli upload --prune \ --server https://subatomic.fyralabs.com \ --token ${{ secrets.SUBATOMIC_TOKEN }} \ - terra${{ matrix.version }}-source anda-build/rpm/srpm/* + terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/* - name: Notify Madoguchi (Success) if: success() diff --git a/andax/get_proj_label.rhai b/andax/get_proj_label.rhai new file mode 100644 index 0000000000..285aa8a89d --- /dev/null +++ b/andax/get_proj_label.rhai @@ -0,0 +1,2 @@ +import "anda::cfg" as cfg; +print(cfg::load_file(labels.project).project.pkg.labels.to_json());