Skip to content

Commit f9b89ad

Browse files
committed
Don't print libs in MacOS + unify local files
1 parent 401cdab commit f9b89ad

File tree

4 files changed

+21
-18
lines changed

4 files changed

+21
-18
lines changed

.github/workflows/cabal.project.local.Linux

-2
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package cardano-crypto-praos
22
flags: -external-libsodium-vrf
33

4-
package HsOpenSSL
4+
package lmdb
55
flags: +use-pkg-config
66

7-
package lmdb
7+
package HsOpenSSL
88
flags: +use-pkg-config

.github/workflows/cabal.project.local.macOS

-2
This file was deleted.

.github/workflows/haskell.yml

+19-12
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,14 @@ jobs:
9999

100100
- name: Add build script path
101101
run: |
102-
# MSYS2 doesn't inherit $GITHUB_PATH, so this workaround is neede
103-
cat <(echo "export PATH=$PATH:$(pwd)/.github/bin") ~/.bashrc > ~/.bashrc.new
104-
mv ~/.bashrc.new ~/.bashrc
105-
106-
# MacOS and Linux use $GITUB_PATH
107-
echo "$(pwd)/.github/bin" >> $GITHUB_PATH
102+
if [ "${{ matrix.os }}" == "windows-latest" ]; then
103+
# MSYS2 doesn't inherit $GITHUB_PATH, so this workaround is needed
104+
cat <(echo "export PATH=$PATH:$(pwd)/.github/bin") ~/.bashrc > ~/.bashrc.new
105+
mv ~/.bashrc.new ~/.bashrc
106+
else
107+
# MacOS and Linux use $GITUB_PATH
108+
echo "$(pwd)/.github/bin" >> $GITHUB_PATH
109+
fi
108110
109111
- name: "WIN: Install build environment (secp256k1)"
110112
if: matrix.os == 'windows-latest'
@@ -173,11 +175,16 @@ jobs:
173175
echo "=== Package list ==="
174176
pkg-config --list-all
175177
176-
echo "=== Package details ==="
177-
for x in $(pkg-config --list-all | cut -d ' ' -f 1); do
178-
echo "# $x"
179-
pkg-config "$x" --cflags --libs
180-
done
178+
if [ "${{ matrix.os }}" == "macos-latest" ]; then
179+
echo "=== Not printing every package detail in MacOS"
180+
# due to the location of the installed libraries this fails on MacOS with stuff not related to us
181+
else
182+
echo "=== Package details ==="
183+
for x in $(pkg-config --list-all | cut -d ' ' -f 1); do
184+
echo "# $x"
185+
pkg-config "$x" --cflags --libs
186+
done
187+
fi
181188
182189
- name: Cabal update
183190
run: retry 2 cabal update
@@ -189,7 +196,7 @@ jobs:
189196
sed -i 's|tests: False|tests: True|g' cabal.project
190197
fi
191198
192-
cp .github/workflows/cabal.project.local.$RUNNER_OS cabal.project.local
199+
cp .github/workflows/cabal.project.local.ci cabal.project.local
193200
194201
echo "# cabal.project.local"
195202
cat cabal.project.local

0 commit comments

Comments
 (0)