From 472dd9ecc13dbda29390810b12750fa2ae527734 Mon Sep 17 00:00:00 2001 From: Willow Date: Thu, 29 May 2025 05:19:48 -0500 Subject: [PATCH] Switch EL10 mock configs to non-dev (#4866) * Update CI to use non-dev mock configs * chore(terra-mock-configs): Update to stable Signed-off-by: Gilver * fix(terra-mock-configs): Also update files list Signed-off-by: Gilver * fix: Revert actually Signed-off-by: Gilver * fix: Comment typo Signed-off-by: Gilver --------- Signed-off-by: Gilver Co-authored-by: Gilver --- .github/workflows/autobuild.yml | 2 +- .github/workflows/bootstrap.yml | 4 ++-- .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 74503d887f..6ec720d5b6 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -69,7 +69,7 @@ jobs: dnf builddep -y ${dir}/*.spec - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} -c terra-el${{ matrix.version }}-dev-${{ matrix.pkg.arch }} ${{ !matrix.pkg.labels.mock == '1' && '-rrpmbuild' || '' }} + run: anda build ${{ matrix.pkg.pkg }} -c terra-el${{ 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 978e5c20ed..364238665e 100644 --- a/.github/workflows/bootstrap.yml +++ b/.github/workflows/bootstrap.yml @@ -48,14 +48,14 @@ jobs: run: anda build anda/terra/release/pkg --rpm-builder=rpmbuild - name: Build Subatomic - run: anda build -c terra-el${{ matrix.version }}-dev-${{ matrix.arch }}.cfg anda/tools/buildsys/subatomic/pkg --rpm-builder=rpmbuild + run: anda build -c terra-el${{ matrix.version }}-${{ matrix.arch }}.cfg anda/tools/buildsys/subatomic/pkg --rpm-builder=rpmbuild - name: Install Subatomic and anda-srpm-macros run: dnf install -y ./anda-build/rpm/rpms/{subatomic,anda-srpm-macros}-*.rpm - name: Install Build Dependencies for Andaman run: dnf builddep -y anda/tools/buildsys/anda/*.spec - name: Build Andaman - run: anda build -c terra-el${{ matrix.version }}-dev-${{ matrix.arch }} anda/tools/buildsys/anda/pkg --rpm-builder=rpmbuild + run: anda build -c terra-el${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg --rpm-builder=rpmbuild - name: Upload packages to subatomic run: | diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4e0d2099e..b892c07973 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-el${{ matrix.version }}-dev-${{ matrix.arch }} anda/${{ matrix.pkg }}pkg + run: anda build -c terra-el${{ 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 5423f73945..7f61f31635 100644 --- a/.github/workflows/json-build.yml +++ b/.github/workflows/json-build.yml @@ -41,7 +41,7 @@ jobs: dnf builddep -y ${dir}/*.spec - name: Build with Andaman - run: anda build ${{ matrix.pkg.pkg }} -c terra-el${{ matrix.version }}-dev-${{ matrix.pkg.arch }} ${{ contains(matrix.pkg.labels, 'mock') && '' || '-rrpmbuild' }} + run: anda build ${{ matrix.pkg.pkg }} -c terra-el${{ matrix.version }}-${{ matrix.pkg.arch }} ${{ contains(matrix.pkg.labels, 'mock') && '' || '-rrpmbuild' }} - name: Generating artifact name id: art