fixup! Support the use of additional APT repositories

jtdor · May 12, 2024 · e587315 · e587315
1 parent 9e122ad
commit e587315
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -223,7 +223,7 @@ jobs:
           test -f debian/artifacts/test_1_amd64.changes
 
   extra-repos:
-    needs: [before-build-hook]
+    needs: [setup-hook]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -232,14 +232,15 @@ jobs:
         env:
           DEB_BUILD_OPTIONS: noautodbgsym
         with:
-          before-build-hook: |
-            ! apt-cache policy | grep -E ' *release.*[ ,]o=Debian[,$$]' | grep -E '[ ,]c=contrib[,$$]'
-            ! apt-cache policy | grep -E ' *release.*[ ,]o=Debian[,$$]' | grep -E '[ ,]c=non-free[,$$]'
           buildpackage-opts: --build=binary --no-sign
           extra-repos: |
             # These are intentionally given as two entries:
             deb http://deb.debian.org/debian stable contrib
             deb http://deb.debian.org/debian stable non-free
+          setup-hook: |
+            apt-get update # Called here manually only for testing purposes!
+            ! apt-cache policy | grep -E ' *release.*[ ,]o=Debian[,$$]' | grep -E '[ ,]c=contrib[,$$]'
+            ! apt-cache policy | grep -E ' *release.*[ ,]o=Debian[,$$]' | grep -E '[ ,]c=non-free[,$$]'
           source-dir: test
       - run: |
           dpkg --info debian/artifacts/test_1_amd64.deb
@@ -248,7 +249,7 @@ jobs:
           test -f debian/artifacts/test_1_amd64.changes
 
   extra-repos-deb822:
-    needs: [before-build-hook]
+    needs: [setup-hook]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -257,9 +258,6 @@ jobs:
         env:
           DEB_BUILD_OPTIONS: noautodbgsym
         with:
-          before-build-hook: |
-            ! apt-cache policy | grep -E ' *release.*[ ,]o=Debian[,$$]' | grep -E '[ ,]c=contrib[,$$]'
-            ! apt-cache policy | grep -E ' *release.*[ ,]o=Debian[,$$]' | grep -E '[ ,]c=non-free[,$$]'
           buildpackage-opts: --build=binary --no-sign
           extra-repos: |
             # These are intentionally given as two entries:
@@ -272,6 +270,10 @@ jobs:
             URIs: http://deb.debian.org/debian
             Suites: stable
             Components: non-free
+          setup-hook: |
+            apt-get update # Called here manually only for testing purposes!
+            ! apt-cache policy | grep -E ' *release.*[ ,]o=Debian[,$$]' | grep -E '[ ,]c=contrib[,$$]'
+            ! apt-cache policy | grep -E ' *release.*[ ,]o=Debian[,$$]' | grep -E '[ ,]c=non-free[,$$]'
           source-dir: test
       - run: |
           dpkg --info debian/artifacts/test_1_amd64.deb