From 60dd96a68f103b803db9f20ce0fe44e8772cfb70 Mon Sep 17 00:00:00 2001 From: madomado Date: Fri, 3 Jan 2025 17:19:26 +0800 Subject: [PATCH] fix(ci): make gha parse variable substitutions correctly (#2865) * feat(ci): add mock label to ci, also remove multilib * feat: switch packages to use `arches = [...]` * ??? Signed-off-by: madomado * feat: add mock labels to pkgs * feat: add condition for setup scripts and dnf builddep * fix(ci): weird formatting issues * wha * if !contains? * single quotes * fix(ci): make gha parse variables correctly? --------- Signed-off-by: madomado --- .github/workflows/autobuild.yml | 2 +- .github/workflows/json-build.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index ba843ec1e2..6ca32c7d35 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -70,7 +70,7 @@ jobs: dnf5 builddep -y ${dir}/*.spec - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} ${{ matrix.pkg.labels['mock'] && '-c terra-${{ matrix.version }}-${{ matrix.pkg.arch }}' || '-rrpmbuild' }} + run: anda build ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ contains(matrix.pkg.labels, 'mock') && '' || '-rrpmbuild' }} - name: Generating artifact name id: art diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index efd5ab5e94..2234e5bff0 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 }} ${{ matrix.pkg.labels['mock'] && '-c terra-${{ matrix.version }}-${{ matrix.pkg.arch }}' || '-rrpmbuild' }} + run: anda build ${{ matrix.pkg.pkg }} -c terra-${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ contains(matrix.pkg.labels, 'mock') && '' || '-rrpmbuild' }} - name: Generating artifact name id: art