Merge pull request #111 from crazy-max/fix-test-golang

golang: fix test with pkgconf
tonistiigi · Jul 13, 2023 · dea0136 · dea0136
2 parents 75ff1e5 + 7eeeac0
commit dea0136
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -68,14 +68,13 @@ jobs:
             typ: debian
             allow-failure: true
           -
-            image: debian:bullseye
+            image: debian:bullseye-backports
             typ: debian
             allow-failure: false
           -
             image: debian:bookworm
             typ: debian
-            # FIXME: Set to false when https://github.com/tonistiigi/xx/issues/95 fixed
-            allow-failure: true
+            allow-failure: false
           -
             image: debian:sid
             typ: debian

diff --git a/src/test-go.bats b/src/test-go.bats
@@ -316,8 +316,9 @@ testHelloCGO() {
   rm -rf /usr/bin/$(xx-info triple)* || true
 
   add llvm
-  add pkg-config || add pkgconf
+  add pkgconf || add pkg-config
   xxadd xx-c-essentials
+  xxadd pkgconf || add pkg-config
   run xx-go env
   assert_success
   assert_output --partial 'CC="'"$(xx-info triple)-clang"'"'