Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: .github/workflows/
Date: Sun, 06 Feb 2022 15:32:22
Message-Id: 1644161168.074b7d518fff59cc19b5a92b89be0aa365d449eb.grobian@gentoo
1 commit: 074b7d518fff59cc19b5a92b89be0aa365d449eb
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 6 15:26:08 2022 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 6 15:26:08 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=074b7d51
7
8 .github: b2sum and coreutils conflict
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 .github/workflows/build-test-ci.yml | 10 ++++++----
13 1 file changed, 6 insertions(+), 4 deletions(-)
14
15 diff --git a/.github/workflows/build-test-ci.yml b/.github/workflows/build-test-ci.yml
16 index fd445bd..d3d1ae2 100644
17 --- a/.github/workflows/build-test-ci.yml
18 +++ b/.github/workflows/build-test-ci.yml
19 @@ -59,7 +59,7 @@ jobs:
20 CC: ${{ matrix.cc }}
21 steps:
22 - name: install deps
23 - run: brew install gpgme gnupg gnu-sed coreutils bash openssl b2sum
24 + run: brew install gpgme gnupg gnu-sed coreutils bash openssl
25 - name: add homebrew utils to PATH
26 run: |
27 echo "$(brew --prefix)/opt/coreutils/libexec/gnubin" >> $GITHUB_PATH
28 @@ -70,11 +70,13 @@ jobs:
29 echo 'LDFLAGS="-L'"$(brew --prefix)/opt/openssl@3/lib ${LDFLAGS}"'"' >> $GITHUB_ENV
30 echo 'CPPFLAGS="-I'"$(brew --prefix)/opt/openssl@3/include ${CPPFLAGS}"'"' >> $GITHUB_ENV
31 echo 'PKG_CONFIG_PATH="'"$(brew --prefix)/opt/openssl@3/lib/pkgconfig:${PKG_CONFIG_PATH}"'"' >> $GITHUB_ENV
32 - echo 'LDFLAGS="-L'"$(brew --prefix)/opt/b2sum/lib ${LDFLAGS}"'"' >> $GITHUB_ENV
33 - echo 'CPPFLAGS="-I'"$(brew --prefix)/opt/b2sum/include ${CPPFLAGS}"'"' >> $GITHUB_ENV
34 - uses: actions/checkout@v2
35 - name: configure
36 - run: ./configure --disable-maintainer-mode --disable-openmp
37 + # we need to disable qmanifest for we cannot get b2sum and
38 + # coreutils installed at the same time :/
39 + run: >
40 + ./configure
41 + --disable-maintainer-mode --disable-openmp --disable-qmanifest
42 - name: make
43 run: make CFLAGS="-O3 -Wall -Wshadow -pipe" V=1 check