From 30e12b4eb1212d9a7d260e0701c827c838816883 Mon Sep 17 00:00:00 2001
From: madonuko <madonuko@outlook.com>
Date: Mon, 29 Jul 2024 14:13:34 +0800
Subject: [PATCH] feat(ci): update bootstrap image

---
 .github/workflows/bootstrap.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 4f814e4ae1..8131ecb675 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -12,7 +12,7 @@ jobs:
       fail-fast: true
     runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
     container:
-      image: registry.access.redhat.com/ubi${{ matrix.version }}/ubi:latest
+      image: docker.io/library/almalinux:${{ matrix.version }}
       options: --cap-add=SYS_ADMIN --privileged
     steps:
       - name: Install repositories
@@ -21,6 +21,7 @@ jobs:
           dnf config-manager --set-enabled crb
           dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${{ matrix.version }}.noarch.rpm
           dnf install -y mock wget git-core openssl-devel cargo podman fuse-overlayfs
+          dnf builddep -y anda/{terra/{mock-configs,srpm-macros},tools/buildsys/{subatomic,anda}}/*.spec
 
       - name: Install Anda
         run: cargo install anda
@@ -34,20 +35,20 @@ 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 -c terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg anda/terra/mock-configs/pkg -p rpm
+          anda build -c almalinux-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg --rpm-builder=rpmbuild
       - name: Install terra-mock-configs
         run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
 
       - name: Build anda-srpm-macros
-        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg anda/terra/srpm-macros/pkg
+        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.arch }}.cfg anda/terra/srpm-macros/pkg --rpm-builder=rpmbuild
 
       - name: Build Subatomic
-        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg anda/tools/buildsys/subatomic/pkg
+        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.arch }}.cfg anda/tools/buildsys/subatomic/pkg --rpm-builder=rpmbuild
       - name: Install Subatomic
         run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
 
       - name: Build Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg
+        run: anda build -c terra-el${{ matrix.version }}+epel-${{ matrix.arch }} anda/tools/buildsys/anda/pkg --rpm-builder=rpmbuild
 
       - name: Upload packages to subatomic
         run: |