From 23ec041e93cecec8ff170336bfd65007423e4e94 Mon Sep 17 00:00:00 2001 From: lleyton Date: Sat, 6 Jan 2024 01:44:52 -0800 Subject: [PATCH] fix: update mock-configs path --- .github/workflows/autobuild.yml | 4 ++-- .github/workflows/bootstrap.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/json-build.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index d0bb87f02a..2638f69b71 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -63,10 +63,10 @@ jobs: - name: Include custom build template instead of package default run: | - cp -v anda/mock-configs/terra.tpl /etc/mock/templates/terra.tpl + cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg + run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg - name: Generating artifact name id: art diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml index 845af65129..380b4ea672 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -42,7 +42,7 @@ jobs: - name: Build terra-mock-configs run: | git config --global --add safe.directory "$GITHUB_WORKSPACE" - anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/mock-configs/pkg -p rpm + anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg -p rpm - name: Install terra-mock-configs run: sudo dnf install -y anda-build/rpm/rpms/terra-mock-configs*.rpm diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8bab8ab4cd..50d35fcae9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }} - name: Build with Andaman - run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg + run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg - name: Generating artifact name id: art diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml index 986f6da5c7..851f72e7ae 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -33,7 +33,7 @@ jobs: key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }} - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg + run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg - name: Generating artifact name id: art