From c349651b6fe630afa3276057ef082d5a0d75911d Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Fri, 30 May 2025 16:37:24 -0700 Subject: [PATCH] feat: set Vendor for packages built on CI (#4803) (#5144) (cherry picked from commit c071e801d10f2bab02351ea1254538254a39231e) Co-authored-by: lea --- .github/workflows/autobuild.yml | 2 +- .github/workflows/bootstrap.yml | 8 ++++---- .github/workflows/build.yml | 2 +- .github/workflows/json-build.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 1f1b172dc1..8ccdd2cc61 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -69,7 +69,7 @@ jobs: dnf5 builddep -y ${dir}/*.spec - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }} + run: anda build ${{ matrix.pkg.pkg }} -D "vendor Terra" -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }} - name: Generating artifact name id: art diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 19d2b85057..82baf9e001 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -46,15 +46,15 @@ jobs: echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV export PATH=$PATH:/github/home/.cargo/bin git config --global --add safe.directory "$GITHUB_WORKSPACE" - anda build -rrpmbuild anda/terra/mock-configs/pkg + anda build -D "vendor Terra" -rrpmbuild anda/terra/mock-configs/pkg - name: Install terra-mock-configs run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm - - name: Build trra-release - run: anda build -rrpmbuild anda/terra/release/pkg + - name: Build terra-release + run: anda build -D "vendor Terra" -rrpmbuild anda/terra/release/pkg - name: Build Subatomic - run: anda build -rrpmbuild anda/tools/buildsys/subatomic/pkg + run: anda build -D "vendor Terra" -rrpmbuild anda/tools/buildsys/subatomic/pkg - name: Install Subatomic run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4465007576..8958c720a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,7 +61,7 @@ jobs: run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Build with Andaman - run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/${{ matrix.pkg }}pkg + run: anda build -D "vendor Terra" -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/${{ matrix.pkg }}pkg - name: Generating artifact name id: art diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index d06643b944..b8d84efc5e 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -41,7 +41,7 @@ jobs: dnf5 builddep -y ${dir}/*.spec - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ contains(matrix.pkg.labels, 'mock') && '' || '-rrpmbuild' }} + run: anda build -D "vendor Terra" ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ contains(matrix.pkg.labels, 'mock') && '' || '-rrpmbuild' }} - name: Generating artifact name id: art