commit:     074b7d518fff59cc19b5a92b89be0aa365d449eb
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  6 15:26:08 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Feb  6 15:26:08 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=074b7d51

.github: b2sum and coreutils conflict

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .github/workflows/build-test-ci.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-test-ci.yml 
b/.github/workflows/build-test-ci.yml
index fd445bd..d3d1ae2 100644
--- a/.github/workflows/build-test-ci.yml
+++ b/.github/workflows/build-test-ci.yml
@@ -59,7 +59,7 @@ jobs:
       CC: ${{ matrix.cc }}
     steps:
       - name: install deps
-        run: brew install gpgme gnupg gnu-sed coreutils bash openssl b2sum
+        run: brew install gpgme gnupg gnu-sed coreutils bash openssl
       - name: add homebrew utils to PATH
         run: |
           echo "$(brew --prefix)/opt/coreutils/libexec/gnubin" >> $GITHUB_PATH
@@ -70,11 +70,13 @@ jobs:
           echo 'LDFLAGS="-L'"$(brew --prefix)/opt/openssl@3/lib ${LDFLAGS}"'"' 
>> $GITHUB_ENV
           echo 'CPPFLAGS="-I'"$(brew --prefix)/opt/openssl@3/include 
${CPPFLAGS}"'"' >> $GITHUB_ENV
           echo 'PKG_CONFIG_PATH="'"$(brew 
--prefix)/opt/openssl@3/lib/pkgconfig:${PKG_CONFIG_PATH}"'"' >> $GITHUB_ENV
-          echo 'LDFLAGS="-L'"$(brew --prefix)/opt/b2sum/lib ${LDFLAGS}"'"' >> 
$GITHUB_ENV
-          echo 'CPPFLAGS="-I'"$(brew --prefix)/opt/b2sum/include 
${CPPFLAGS}"'"' >> $GITHUB_ENV
       - uses: actions/checkout@v2
       - name: configure
-        run: ./configure --disable-maintainer-mode --disable-openmp
+        # we need to disable qmanifest for we cannot get b2sum and
+        # coreutils installed at the same time :/
+        run: >
+          ./configure
+          --disable-maintainer-mode --disable-openmp --disable-qmanifest
       - name: make
         run: make CFLAGS="-O3 -Wall -Wshadow -pipe" V=1 check
 

Reply via email to