feat(ci): use -rrpmbuild

terrapkg · Dec 14, 2024 · b794b97 · b794b97
1 parent 1a644e5
commit b794b97
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -63,16 +63,13 @@ jobs:
 
       - name: Include custom build template instead of package default
         run: |
-          cp -v mock-configs/el${{ matrix.version }}.tpl /etc/mock/templates/
-          cp -v mock-configs/epel${{ matrix.version }}.tpl /etc/mock/templates/
+          cp -v mock-configs/terra-el.tpl /etc/mock/templates/
+          cp -v mock-configs/terra-el-dev.tpl /etc/mock/templates/
 
       - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg
-
-      - name: Build with Andaman (alternate arch)
-        if: |
-          matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib']
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-el${{ matrix.version }}+epel-i386.cfg
+        run: |
+          dnf builddep -y `echo ${{ matrix.pkg.pkg }} | sed -E 's@/pkg$@/*.spec@'`
+          anda build ${{ matrix.pkg.pkg }} -rrpmbuild
 
       - name: Generating artifact name
         id: art

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -68,11 +68,13 @@ jobs:
 
       - name: Include custom build template instead of package default
         run: |
-          cp -v mock-configs/el${{ matrix.version }}.tpl /etc/mock/templates/
-          cp -v mock-configs/epel${{ matrix.version }}.tpl /etc/mock/templates/
+          cp -v mock-configs/terra-el.tpl /etc/mock/templates/
+          cp -v mock-configs/terra-el-dev.tpl /etc/mock/templates/
 
       - name: Build with Andaman
-        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c mock-configs/terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg
+        run: |
+          dnf builddep -y anda/${{ matrix.pkg }}*.spec
+          anda build anda/${{ matrix.pkg }}pkg -rrpmbuild
 
       - name: Generating artifact name
         id: art

diff --git a/.github/workflows/json-build.yml b/.github/workflows/json-build.yml
@@ -34,11 +34,13 @@ jobs:
 
       - name: Include custom build template instead of package default
         run: |
-          cp -v mock-configs/el${{ matrix.version }}.tpl /etc/mock/templates/
-          cp -v mock-configs/epel${{ matrix.version }}.tpl /etc/mock/templates/
+          cp -v mock-configs/terra-el.tpl /etc/mock/templates/
+          cp -v mock-configs/terra-el-dev.tpl /etc/mock/templates/
 
       - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-el${{ matrix.version }}+epel-${{ matrix.pkg.arch }}.cfg
+        run: |
+          dnf builddep -y `echo ${{ matrix.pkg.pkg }} | sed -E 's@/pkg$@/*.spec@'`
+          anda build ${{ matrix.pkg.pkg }} -rrpmbuild
 
       - name: Generating artifact name
         id: art

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -3,18 +3,18 @@ name: Lint
 on:
   push:
     branches:
-      - frawhide
+      - el10
   pull_request:
     branches:
-      - frawhide
+      - el10
   merge_group:
     branches:
-      - frawhide
+      - el10
 jobs:
   lint:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/terrapkg/builder:frawhide
+      image: ghcr.io/terrapkg/builder:el10
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4